aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.github/workflows/develop_update.yml7
1 files changed, 5 insertions, 2 deletions
diff --git a/.github/workflows/develop_update.yml b/.github/workflows/develop_update.yml
index 101d235e0..635cf81e0 100644
--- a/.github/workflows/develop_update.yml
+++ b/.github/workflows/develop_update.yml
@@ -23,10 +23,13 @@ jobs:
23 git checkout develop 23 git checkout develop
24 24
25 - name: Check if branch locked 25 - name: Check if branch locked
26 run: | 26 id: check_locked
27 test -e .locked || exit 1 27 uses: andstor/file-existence-action@v1
28 with:
29 files: ".locked"
28 30
29 - name: Update develop from master 31 - name: Update develop from master
32 if: steps.check_locked.outputs.files_exists == 'false'
30 run: | 33 run: |
31 git merge origin/master 34 git merge origin/master
32 git push origin develop 35 git push origin develop