Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

🍒 Merge changes from PR #247 to release-v1.6.0 #249

Merged
merged 3 commits into from
Aug 26, 2024

Conversation

github-actions[bot]
Copy link

Automated PR to merge changes from develop to release-v1.6.0

I failed to cherry-pick the changes automatically because of the following:

Auto-merging infrastructure/environments/github.ts
[auto-pr-release-v1.6.0-247-15129 c0a3fc0e] only allow using tokens in environment creator that do not expire
Author: Riku Rouvila <[email protected]>
Date: Mon Aug 26 10:10:10 2024 +0300
2 files changed, 17 insertions(+)
Auto-merging CHANGELOG.md
CONFLICT (content): Merge conflict in CHANGELOG.md
error: could not apply 297c697b... verify token is functional when fetching secrets from another github environment

To continue manually you can use these commands:

git fetch origin auto-pr-release-v1.6.0-247-15129:auto-pr-release-v1.6.0-247-15129
git fetch origin ocrvs-7367:ocrvs-7367

git checkout auto-pr-release-v1.6.0-247-15129
git reset --hard HEAD~1  # Remove placeholder commit
git cherry-pick 0de8f0b6 297c697b 3ba11200

@rikukissa rikukissa force-pushed the auto-pr-release-v1.6.0-247-15129 branch from 47a9a57 to ba8162b Compare August 26, 2024 08:58
@rikukissa rikukissa force-pushed the auto-pr-release-v1.6.0-247-15129 branch from ba8162b to 7cb950b Compare August 26, 2024 08:59
@rikukissa rikukissa merged commit e586522 into release-v1.6.0 Aug 26, 2024
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant