-
Notifications
You must be signed in to change notification settings - Fork 1.9k
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
Add condition that PRs are merged in backport workflow #5997
Add condition that PRs are merged in backport workflow #5997
Conversation
f3d2395
to
016e266
Compare
Gradle Check (Jenkins) Run Completed with:
|
Thanks @andrross! Hopefully no more backport struggles 🚒 |
Force push issue |
Gradle Check (Jenkins) Run Completed with:
|
This will need a merge on #5993 |
This brings our backport workflow script in line with the script from the [tibdex/backport][1] github action implementation. [1]: https://github.com/tibdex/backport/blob/b1bb2aaf611d9f2e5d1900c06493769b9f102a45/.github/workflows/backport.yml#L12-L22 Signed-off-by: Andrew Ross <andrross@amazon.com>
016e266
to
cf697d1
Compare
Gradle Check (Jenkins) Run Completed with:
|
The backport to
To backport manually, run these commands in your terminal: # Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/backport-2.x
# Create a new branch
git switch --create backport/backport-5997-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 715ff72c1bf1ca31e861639faa664f92f6115501
# Push it to GitHub
git push --set-upstream origin backport/backport-5997-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/backport-2.x Then, create a pull request where the |
Might have failed because of #5992 |
…oject#5997) This brings our backport workflow script in line with the script from the [tibdex/backport][1] github action implementation. [1]: https://github.com/tibdex/backport/blob/b1bb2aaf611d9f2e5d1900c06493769b9f102a45/.github/workflows/backport.yml#L12-L22 Signed-off-by: Andrew Ross <andrross@amazon.com> (cherry picked from commit 715ff72)
Backport PR: #6002 |
…oject#5997) This brings our backport workflow script in line with the script from the [tibdex/backport][1] github action implementation. [1]: https://github.com/tibdex/backport/blob/b1bb2aaf611d9f2e5d1900c06493769b9f102a45/.github/workflows/backport.yml#L12-L22 Signed-off-by: Andrew Ross <andrross@amazon.com> (cherry picked from commit 715ff72)
This brings our backport workflow script in line with the script from the [tibdex/backport][1] github action implementation. [1]: https://github.com/tibdex/backport/blob/b1bb2aaf611d9f2e5d1900c06493769b9f102a45/.github/workflows/backport.yml#L12-L22 Signed-off-by: Andrew Ross <andrross@amazon.com> (cherry picked from commit 715ff72)
This brings our backport workflow script in line with the script from the tibdex/backport github action implementation.
Issues Resolved
[List any issues this PR will resolve]
Check List
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.