Skip to content

Commit

Permalink
ci(bump): simplify cherry-pick to main on stable-bump
Browse files Browse the repository at this point in the history
  • Loading branch information
joshuef committed May 7, 2024
1 parent bbf803c commit 64065c5
Showing 1 changed file with 1 addition and 5 deletions.
6 changes: 1 addition & 5 deletions .github/workflows/version_bump.yml
Original file line number Diff line number Diff line change
Expand Up @@ -76,16 +76,12 @@ jobs:
branch: ${{ github.ref_name }}
tags: true

- name: Get the new SHA of the updated release commit
id: get-updated-sha
run: echo "sha=$(git log --grep='chore(release):' -n 1 --pretty=format:"%H")" >> $GITHUB_ENV

- name: Cherry-pick to main if on stable
if: ${{ github.ref_name == 'stable' }}
run: |
git fetch origin main
git checkout main
git cherry-pick ${{ steps.get-updated-sha.outputs.sha }}
git cherry-pick stable
- name: Push updated version bump commit to main
if: ${{ github.ref_name == 'stable' }}
Expand Down

0 comments on commit 64065c5

Please sign in to comment.