Skip to content

Commit 3671333

Browse files
committed
fix: dude
1 parent 6d9b9c2 commit 3671333

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed

.github/workflows/release.yml

+9-3
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,21 @@ jobs:
3333
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3434
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
3535

36+
- name: If on master, merge semantic release commits back to develop
37+
if: github.ref == 'refs/heads/master'
38+
run: |
39+
git checkout develop
40+
git merge --ff-only master
41+
git push --force --set-upstream origin develop
42+
env:
43+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
44+
3645
# If on master!
3746
- name: Add White Label Tags
3847
if: |
3948
github.ref == 'refs/heads/master' &&
4049
steps.semantic.outputs.new-release-published == 'true'
4150
run: |
42-
git checkout develop
43-
git merge --ff-only master
44-
git push --force --set-upstream origin develop
4551
git checkout master
4652
git tag akronites/${{steps.semantic.outputs.release-version}}
4753
git push origin akronites/${{steps.semantic.outputs.release-version}}

0 commit comments

Comments
 (0)