diff options
| author | Drashna Jael're <drashna@live.com> | 2022-03-25 16:19:22 -0700 |
|---|---|---|
| committer | Drashna Jael're <drashna@live.com> | 2022-03-25 16:19:22 -0700 |
| commit | 53ff570bf068e04740f187163774327839dfa68b (patch) | |
| tree | 5429e069fc593d484b0b479de422b51ac239be83 /.github/workflows | |
| parent | e8171efc7158ba4ebb24827680b19b775d366b1a (diff) | |
| parent | efc9c525b19b33c6e09057218ea64f07f45f9555 (diff) | |
Remerge 0.16.x' into firmware21
Diffstat (limited to '.github/workflows')
| -rw-r--r-- | .github/workflows/develop_update.yml | 30 | ||||
| -rw-r--r-- | .github/workflows/feature_branch_update.yml | 35 | ||||
| -rw-r--r-- | .github/workflows/format.yaml | 8 | ||||
| -rw-r--r-- | .github/workflows/format_push.yaml | 8 |
4 files changed, 73 insertions, 8 deletions
diff --git a/.github/workflows/develop_update.yml b/.github/workflows/develop_update.yml new file mode 100644 index 0000000000..90159406a6 --- /dev/null +++ b/.github/workflows/develop_update.yml @@ -0,0 +1,30 @@ +name: Update develop after master merge + +on: + push: + branches: + - master + +jobs: + develop_update: + runs-on: ubuntu-latest + + if: github.repository == 'qmk/qmk_firmware' + + steps: + - uses: actions/checkout@v2 + with: + token: ${{ secrets.QMK_BOT_TOKEN }} + fetch-depth: 0 + + - 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 diff --git a/.github/workflows/feature_branch_update.yml b/.github/workflows/feature_branch_update.yml new file mode 100644 index 0000000000..98d3616ad1 --- /dev/null +++ b/.github/workflows/feature_branch_update.yml @@ -0,0 +1,35 @@ +name: Update feature branches after develop merge + +on: + push: + branches: + - develop + +jobs: + feature_branch_update: + runs-on: ubuntu-latest + + if: github.repository == 'qmk/qmk_firmware' + + strategy: + matrix: + branch: + - xap + + steps: + - uses: actions/checkout@v2 + with: + token: ${{ secrets.QMK_BOT_TOKEN }} + fetch-depth: 0 + + - name: Checkout branch + run: | + git fetch origin develop ${{ matrix.branch }} + git checkout ${{ matrix.branch }} + + - name: Update branch from develop + run: | + git config --global user.name "QMK Bot" + git config --global user.email "hello@qmk.fm" + git merge origin/develop + git push origin ${{ matrix.branch }} diff --git a/.github/workflows/format.yaml b/.github/workflows/format.yaml index f1525526ce..ba0a86aa78 100644 --- a/.github/workflows/format.yaml +++ b/.github/workflows/format.yaml @@ -19,14 +19,14 @@ jobs: container: qmkfm/qmk_cli steps: - - name: Install dependencies - run: | - apt-get update && apt-get install -y dos2unix - - uses: actions/checkout@v2 with: fetch-depth: 0 + - name: Install dependencies + run: | + pip3 install -r requirements-dev.txt + - uses: trilom/file-changes-action@v1.2.4 id: file_changes with: diff --git a/.github/workflows/format_push.yaml b/.github/workflows/format_push.yaml index 38280f88bc..2f5b679499 100644 --- a/.github/workflows/format_push.yaml +++ b/.github/workflows/format_push.yaml @@ -12,14 +12,14 @@ jobs: container: qmkfm/qmk_cli steps: - - name: Install dependencies - run: | - apt-get update && apt-get install -y dos2unix - - uses: actions/checkout@v2 with: fetch-depth: 0 + - name: Install dependencies + run: | + pip3 install -r requirements-dev.txt + - name: Run qmk formatters shell: 'bash {0}' run: | |