summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Challis <git@zvecr.com>2020-11-22 15:50:14 +0000
committerGitHub <noreply@github.com>2020-11-22 07:50:14 -0800
commitca9edc5fe392d0349e77c26b745cbef2f85b160e (patch)
treea44637fdd11d1d07e55d9e95803239c58f724b41
parenta952bf2d31ec379ec5e5bbf9b1d1b2673ebbacad (diff)
Fix failed develop updates within CI (#11001)
* Fix inverted logic * skip locked instead of fail
-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 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