alterNERDtive/qmk_firmware
1
0
Fork 0
Code Pull requests Activity

Fix failed develop updates within CI (#11001)

Browse source 
* Fix inverted logic

* skip locked instead of fail
This commit is contained in:
Joel Challis 2020-11-22 15:50:14 +00:00 committed by GitHub
parent a952bf2d31
commit ca9edc5fe3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
.github/workflows/develop_update.yml vendored
View file

@ -23,10 +23,13 @@ jobs:
git checkout develop git checkout develop
- name: Check if branch locked - name: Check if branch locked
run: | id: check_locked
test -e .locked || exit 1 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