Browse Source

Fix failed develop updates within CI (#11001)

* Fix inverted logic

* skip locked instead of fail
Joel Challis 5 years ago
parent
commit
ca9edc5fe3
1 changed files with 5 additions and 2 deletions
  1. 5 2
      .github/workflows/develop_update.yml

+ 5 - 2
.github/workflows/develop_update.yml

@@ -23,10 +23,13 @@ jobs:
         git checkout develop
         git checkout develop
 
 
     - name: Check if branch locked
     - 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
     - name: Update develop from master
+      if: steps.check_locked.outputs.files_exists == 'false'
       run: |
       run: |
         git merge origin/master
         git merge origin/master
         git push origin develop
         git push origin develop