diff options
| author | QMK Bot <hello@qmk.fm> | 2022-03-15 12:50:04 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2022-03-15 12:50:04 +0000 |
| commit | 872b521e4f4474ba9a4f4eb640fbdb5a386f2ac4 (patch) | |
| tree | 376da801fa5482a6d78ccf9280e7a67122d8c5a8 /.github/workflows/develop_update.yml | |
| parent | 3315894269767014e0510cc95bb52edd3b0b5161 (diff) | |
| parent | 46e85ded4747fb3d89f107cb098d9054ea5e632c (diff) | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to '.github/workflows/develop_update.yml')
| -rw-r--r-- | .github/workflows/develop_update.yml | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/.github/workflows/develop_update.yml b/.github/workflows/develop_update.yml index 285720fefe..1f5c841bff 100644 --- a/.github/workflows/develop_update.yml +++ b/.github/workflows/develop_update.yml @@ -5,7 +5,6 @@ on: branches: - master - jobs: develop_update: runs-on: ubuntu-latest @@ -22,14 +21,7 @@ jobs: git fetch origin master develop git checkout develop - - name: Check if branch locked - 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 config --global user.name "QMK Bot" git config --global user.email "hello@qmk.fm" |