[Display][Painter] Reduce throttling for faster render at slight scan… #613
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
name: Update develop after master merge | |
permissions: | |
contents: write | |
on: | |
workflow_dispatch: | |
push: | |
branches: | |
- master | |
jobs: | |
develop_update: | |
runs-on: ubuntu-latest | |
if: | | |
github.repository == 'drashna/qmk_userspace' && github.ref == 'refs/heads/master' | |
steps: | |
- uses: actions/checkout@v4 | |
with: | |
token: ${{ secrets.GH_BOT_SECRET }} | |
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 | |
id: update | |
run: | | |
git config --global user.name "Drashna Bot" | |
git config user.email [email protected] | |
git rebase origin/master | |
# - name: Create Pull Request | |
# if: always() && steps.update.conclusion == 'failure' | |
# run: | | |
# git rebase --abort | |
# gh pr create -B develop -H master --title 'Manually update develop branch after master merge' --body 'Created by Github action' | |
- name: Push updates to develop | |
if: steps.update.conclusion != 'failure' | |
run: | | |
git push origin develop --force-with-lease |