Browse Source
Fix failed develop updates within CI (#11001)
* Fix inverted logic
* skip locked instead of fail
pull/11009/head
Joel Challis
3 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
5 additions and
2 deletions
-
.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 |