Skip to content

Commit

Permalink
Fix failed develop updates within CI (qmk#11001)
Browse files Browse the repository at this point in the history
* Fix inverted logic

* skip locked instead of fail
  • Loading branch information
zvecr authored Nov 22, 2020
1 parent a952bf2 commit ca9edc5
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions .github/workflows/develop_update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit ca9edc5

Please sign in to comment.