Bump backport version. #1009
Bump backport version. #1009
Conversation
Signed-off-by: Yury-Fridlyand <yuryf@bitquilltech.com>
Codecov Report
@@ Coverage Diff @@
## 2.x #1009 +/- ##
============================================
+ Coverage 98.18% 98.22% +0.03%
- Complexity 3224 3272 +48
============================================
Files 310 314 +4
Lines 8062 8205 +143
Branches 525 535 +10
============================================
+ Hits 7916 8059 +143
Misses 142 142
Partials 4 4
Flags with carried forward coverage won't be shown. Click here to find out more.
Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here. |
dai-chen
added
the
infrastructure
|
Thanks for working on this. Is there any chance to confirm if the previous failures can be fixed by this indeed? Or it doesn't hurt to upgrade it anyway? |
|
Unfortunately, I can't confirm. I don't know how to reproduce that and I can't test it on a fork. |
@Yury-Fridlyand @dai-chen The new version essentially gets latest changes from upstream and adds a new option |
|
All backports I listed I did manually and |
Oh thats weird. I have not seen this issue in any other repos. May be we can keep an eye and see if it happens again? |
.github/workflows/backport.yml
Outdated
| with: | ||
| app_id: ${{ secrets.APP_ID }} | ||
| private_key: ${{ secrets.APP_PRIVATE_KEY }} | ||
| installation_id: 22958780 | ||
|
|
||
| - name: Backport | ||
| uses: VachaShah/backport@v1.1.4 | ||
| uses: VachaShah/backport@v2.1.0 | ||
| with: | ||
| github_token: ${{ steps.github_app_token.outputs.token }} | ||
| branch_name: backport/backport-${{ github.event.number }} |
There was a problem hiding this comment.
There was a problem hiding this comment.
Thanks, fixed in ebc91aa.
Signed-off-by: Yury-Fridlyand <yuryf@bitquilltech.com>
|
yes, i don't know if this fixes conflict during backport but it's good to use updated versions.. |
|
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-main main
# Navigate to the new working tree
pushd ../.worktrees/backport-main
# Create a new branch
git switch --create backport/backport-1009-to-main
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 81e5569a5ebc7b632e22edeb50c7602aac5fb0cc
# Push it to GitHub
git push --set-upstream origin backport/backport-1009-to-main
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/backport-mainThen, create a pull request where the |
Signed-off-by: Yury-Fridlyand yuryf@bitquilltech.com
Description
Backport often fails last time, even if there are no merge conflicts. I hope updating the workflow would fix this.
@VachaShah, could you please describe what was fixed?
Issues Resolved
Failed ports:
#839 (comment)
#716 (comment)
#745 (comment)
#747 (comment)
#748 (comment)
...
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.