@@ -3,9 +3,7 @@ name: Hotfix Release
33on :
44 push :
55 branches :
6- - main
7- tags :
8- - ' 0.*'
6+ - ' hotfix/*'
97
108env :
119 REGISTRY : docker.io
@@ -40,32 +38,32 @@ jobs:
4038 GITHUB_TOKEN : ${{ secrets.GITHUB_TOKEN }}
4139 run : npx semantic-release
4240
43- cherry-pick :
44- if : contains(github.event.head_commit.message, 'hotfix:')
45- runs-on : ubuntu-latest
46- needs : semantic-release
47- permissions :
48- contents : write # to be able to push to the main branch
49- pull-requests : write # to be able to create a pull request
50- steps :
51- - name : Checkout main branch
52- uses : actions/checkout@v4
53- with :
54- ref : main
41+ # cherry-pick:
42+ # if: contains(github.event.head_commit.message, 'hotfix:')
43+ # runs-on: ubuntu-latest
44+ # needs: semantic-release
45+ # permissions:
46+ # contents: write # to be able to push to the main branch
47+ # pull-requests: write # to be able to create a pull request
48+ # steps:
49+ # - name: Checkout main branch
50+ # uses: actions/checkout@v4
51+ # with:
52+ # ref: main
5553
56- - name : Configure Git
57- run : |
58- git config user.name "github-actions"
59- git config user.email "github-actions@github.com"
54+ # - name: Configure Git
55+ # run: |
56+ # git config user.name "github-actions"
57+ # git config user.email "github-actions@github.com"
6058
61- - name : Cherry-pick hotfix commit into dev
62- run : |
63- # Get the latest hotfix commit from main
64- HOTFIX_COMMIT=$(git log -1 --pretty=format:"%H")
65- # Fetch the dev branch so it is available locally
66- git fetch origin dev:dev
67- # Check out dev
68- git checkout dev
69- # Cherry-pick the commit from main to dev
70- git cherry-pick $HOTFIX_COMMIT
71- git push origin dev
59+ # - name: Cherry-pick hotfix commit into dev
60+ # run: |
61+ # # Get the latest hotfix commit from main
62+ # HOTFIX_COMMIT=$(git log -1 --pretty=format:"%H")
63+ # # Fetch the dev branch so it is available locally
64+ # git fetch origin dev:dev
65+ # # Check out dev
66+ # git checkout dev
67+ # # Cherry-pick the commit from main to dev
68+ # git cherry-pick $HOTFIX_COMMIT
69+ # git push origin dev
0 commit comments