diff options
Diffstat (limited to '.github/workflows/develop_update.yml')
-rw-r--r-- | .github/workflows/develop_update.yml | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/.github/workflows/develop_update.yml b/.github/workflows/develop_update.yml deleted file mode 100644 index afcda1fe98..0000000000 --- a/.github/workflows/develop_update.yml +++ /dev/null @@ -1,37 +0,0 @@ -name: Update develop after master merge - -permissions: - contents: write - -on: - push: - branches: - - master - -jobs: - develop_update: - runs-on: ubuntu-latest - - if: github.repository == 'qmk/qmk_firmware' - - steps: - - uses: actions/checkout@v4 - with: - token: ${{ secrets.QMK_BOT_TOKEN }} - fetch-depth: 0 - - - name: Disable automatic eol conversion - run: | - echo "* -text" > .git/info/attributes - - - name: Checkout develop - run: | - git fetch origin master develop - git checkout develop - - - name: Update develop from master - run: | - git config --global user.name "QMK Bot" - git config --global user.email "hello@qmk.fm" - git merge origin/master - git push origin develop |