Skip to content

Commit 39464b0

Browse files
authored
hotfix: fixing the hotfix cherry-pick (#33)
1 parent c7eb23e commit 39464b0

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

.github/workflows/hotfix.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,12 @@ jobs:
6060
6161
- name: Cherry-pick hotfix commit into dev
6262
run: |
63+
# Get the latest hotfix commit from main
6364
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
6468
git checkout dev
69+
# Cherry-pick the commit from main to dev
6570
git cherry-pick $HOTFIX_COMMIT
6671
git push origin dev

0 commit comments

Comments
 (0)