Skip to content

Commit

Permalink
fixup! ci: check if a PR can be backported
Browse files Browse the repository at this point in the history
  • Loading branch information
tzemanovic committed Feb 21, 2025
1 parent 0bc499b commit e9a60db
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,14 @@ jobs:
# Find common ancestor between main and topic branch
BRANCH_POINT=$(git merge-base $(git rev-parse --abbrev-ref HEAD) origin/main)
[[ -z BRANCH_POINT ]] && echo "No branch point" && exit 1
echo "::set-output name=REF::$BRANCH_POINT"
echo "REF=$BRANCH_POINT" >> $GITHUB_OUTPUT"
- name: Checkout libs maintenance branch
uses: actions/checkout@v4
with:
ref: ${{ env.MAINT_LIBS_BRANCH }}
- name: Backport PR to libs maintenance branch
run: |
git cherry-pick --strategy=recursive --strategy-option=theirs ${{ steps.branch_point.outputs.REF }}..${{ github.event.pull_request.head.ref }}
git cherry-pick --strategy=recursive --strategy-option=theirs ${{ steps.branch_point.outputs.REF }}..${{ github.event.pull_request.head.sha }}
- name: Instal cargo release
run: cargo binstall -y cargo-release
- name: Install build deps
Expand Down

0 comments on commit e9a60db

Please sign in to comment.