From 46e85ded4747fb3d89f107cb098d9054ea5e632c Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Tue, 15 Mar 2022 12:49:23 +0000 Subject: Add merge workflow for XAP branch (#16652) * Add merge workflow for XAP branch * uncomment --- .github/workflows/develop_update.yml | 8 -------- 1 file changed, 8 deletions(-) (limited to '.github/workflows/develop_update.yml') 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" -- cgit v1.2.3