diff options
Diffstat (limited to '.github/workflows')
-rw-r--r-- | .github/workflows/auto_approve.yml | 18 | ||||
-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.yml | 2 | ||||
-rw-r--r-- | .github/workflows/format_push.yml | 8 | ||||
-rw-r--r-- | .github/workflows/labeler.yml | 14 | ||||
-rw-r--r-- | .github/workflows/lint.yml | 5 | ||||
-rw-r--r-- | .github/workflows/unit_test.yml | 2 |
8 files changed, 12 insertions, 102 deletions
diff --git a/.github/workflows/auto_approve.yml b/.github/workflows/auto_approve.yml deleted file mode 100644 index dea3f017dd..0000000000 --- a/.github/workflows/auto_approve.yml +++ /dev/null @@ -1,18 +0,0 @@ -name: Automatic Approve - -on: - schedule: - - cron: "*/5 * * * *" - -jobs: - automatic_approve: - runs-on: ubuntu-latest - - if: github.repository == 'qmk/qmk_firmware' - - steps: - - uses: mheap/automatic-approve-action@v1 - with: - token: ${{ secrets.QMK_BOT_TOKEN }} - workflows: "format.yml,lint.yml,unit_test.yml" - dangerous_files: "lib/python/,Makefile,paths.mk,builddefs/" diff --git a/.github/workflows/develop_update.yml b/.github/workflows/develop_update.yml deleted file mode 100644 index 90159406a6..0000000000 --- a/.github/workflows/develop_update.yml +++ /dev/null @@ -1,30 +0,0 @@ -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 deleted file mode 100644 index 98d3616ad1..0000000000 --- a/.github/workflows/feature_branch_update.yml +++ /dev/null @@ -1,35 +0,0 @@ -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.yml b/.github/workflows/format.yml index ba0a86aa78..b6ce4063fe 100644 --- a/.github/workflows/format.yml +++ b/.github/workflows/format.yml @@ -19,7 +19,7 @@ jobs: container: qmkfm/qmk_cli steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: fetch-depth: 0 diff --git a/.github/workflows/format_push.yml b/.github/workflows/format_push.yml index 2f5b679499..f9c691bdd4 100644 --- a/.github/workflows/format_push.yml +++ b/.github/workflows/format_push.yml @@ -12,10 +12,14 @@ jobs: container: qmkfm/qmk_cli steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: fetch-depth: 0 + - name: Disable automatic eol conversion + run: | + echo "* -text" > .git/info/attributes + - name: Install dependencies run: | pip3 install -r requirements-dev.txt @@ -36,7 +40,7 @@ jobs: git config user.email 'hello@qmk.fm' - name: Create Pull Request - uses: peter-evans/create-pull-request@v3 + uses: peter-evans/create-pull-request@v4 if: ${{ github.repository == 'qmk/qmk_firmware'}} with: token: ${{ secrets.QMK_BOT_TOKEN }} diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml deleted file mode 100644 index 3b99a8f43e..0000000000 --- a/.github/workflows/labeler.yml +++ /dev/null @@ -1,14 +0,0 @@ -name: "Pull Request Labeler" - -on: - pull_request_target: - types: [opened, synchronize, reopened, ready_for_review, locked] - -jobs: - triage: - runs-on: ubuntu-latest - steps: - - uses: actions/labeler@main - with: - repo-token: "${{ secrets.GITHUB_TOKEN }}" - configuration-path: '.github/labeler.yml' diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index c7a8624ee1..5b8a45f26b 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -12,10 +12,13 @@ jobs: container: qmkfm/qmk_cli steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 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/unit_test.yml b/.github/workflows/unit_test.yml index 60d51ce321..6f03a976ea 100644 --- a/.github/workflows/unit_test.yml +++ b/.github/workflows/unit_test.yml @@ -22,7 +22,7 @@ jobs: container: qmkfm/qmk_cli steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: submodules: recursive - name: Install dependencies |