Unverified Commit 04d93b99 authored by Paul Kaplan's avatar Paul Kaplan Committed by GitHub

Try again to automate release branch creation

parent d34d8632
...@@ -18,7 +18,6 @@ jobs: ...@@ -18,7 +18,6 @@ jobs:
- name: Checkout master - name: Checkout master
uses: actions/checkout@v2 uses: actions/checkout@v2
with: with:
fetch-depth: 1
ref: automation-test-master # todo change to master ref: automation-test-master # todo change to master
- name: Set output variables - name: Set output variables
id: vars id: vars
...@@ -27,7 +26,7 @@ jobs: ...@@ -27,7 +26,7 @@ jobs:
- name: Create release branch and merge develop - name: Create release branch and merge develop
run: | run: |
git checkout -b ${{ steps.vars.outputs.branch }} git checkout -b ${{ steps.vars.outputs.branch }}
git merge develop git merge origin/develop
git push git push
- name: Show merge commit - name: Show merge commit
run: git --no-pager show run: git --no-pager show
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment