Skip to content

Commit afe18a2

Browse files
committed
Release pipeline update
1 parent 12e29d0 commit afe18a2

File tree

1 file changed

+0
-2
lines changed

1 file changed

+0
-2
lines changed

.github/workflows/release.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,15 +95,13 @@ jobs:
9595
prerelease: false
9696

9797
- name: Checkout develop branch
98-
if: ${{ github.ref }} == 'master'
9998
uses: actions/checkout@v2
10099
with:
101100
ref: 'develop'
102101
fetch-depth: 0
103102

104103
- name: Merge release branch into develop
105104
id: mergeIntoDevelop
106-
if: ${{ github.ref }} == 'master'
107105
run: |
108106
git merge -m 'Merge master branch into develop after a release' origin/master
109107
git status | (! grep -Fq 'both modified:') || git status | grep -F 'both modified:' \

0 commit comments

Comments
 (0)