diff options
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/develop_update.yml | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/.github/workflows/develop_update.yml b/.github/workflows/develop_update.yml index 101d235e04..635cf81e0c 100644 --- a/.github/workflows/develop_update.yml +++ b/.github/workflows/develop_update.yml @@ -23,10 +23,13 @@ jobs: git checkout develop - name: Check if branch locked - run: | - test -e .locked || exit 1 + id: check_locked + uses: andstor/file-existence-action@v1 + with: + files: ".locked" - name: Update develop from master + if: steps.check_locked.outputs.files_exists == 'false' run: | git merge origin/master git push origin develop |