File tree 1 file changed +9
-3
lines changed
1 file changed +9
-3
lines changed Original file line number Diff line number Diff line change @@ -33,15 +33,21 @@ jobs:
33
33
GITHUB_TOKEN : ${{ secrets.GITHUB_TOKEN }}
34
34
NPM_TOKEN : ${{ secrets.NPM_TOKEN }}
35
35
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
+
36
45
# If on master!
37
46
- name : Add White Label Tags
38
47
if : |
39
48
github.ref == 'refs/heads/master' &&
40
49
steps.semantic.outputs.new-release-published == 'true'
41
50
run : |
42
- git checkout develop
43
- git merge --ff-only master
44
- git push --force --set-upstream origin develop
45
51
git checkout master
46
52
git tag akronites/${{steps.semantic.outputs.release-version}}
47
53
git push origin akronites/${{steps.semantic.outputs.release-version}}
You can’t perform that action at this time.
0 commit comments