~ruther/qmk_firmware

ca9edc5fe392d0349e77c26b745cbef2f85b160e — Joel Challis 4 years ago a952bf2
Fix failed develop updates within CI (#11001)

* Fix inverted logic

* skip locked instead of fail
1 files changed, 5 insertions(+), 2 deletions(-)

M .github/workflows/develop_update.yml
M .github/workflows/develop_update.yml => .github/workflows/develop_update.yml +5 -2
@@ 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