From 44b48e6c2d3375432939d04c2acfc1232dc5d0a9 Mon Sep 17 00:00:00 2001 From: Martine Lenders Date: Fri, 4 Dec 2020 17:00:30 +0100 Subject: [PATCH] gh-actions: move PR checks from static tests to own workflow --- .github/workflows/check-labels.yml | 15 ------------ .github/workflows/check-pr.yml | 39 ++++++++++++++++++++++++++++++ dist/tools/ci/static_tests.sh | 2 -- 3 files changed, 39 insertions(+), 17 deletions(-) delete mode 100644 .github/workflows/check-labels.yml create mode 100644 .github/workflows/check-pr.yml diff --git a/.github/workflows/check-labels.yml b/.github/workflows/check-labels.yml deleted file mode 100644 index cc4a4f26b5..0000000000 --- a/.github/workflows/check-labels.yml +++ /dev/null @@ -1,15 +0,0 @@ -name: check-labels -on: - pull_request: - types: [opened, reopened, labeled, unlabeled, synchronize] - pull_request_review: - types: [submitted, dismissed] -jobs: - check-labels: - runs-on: ubuntu-latest - steps: - - uses: RIOT-OS/check-labels-action@v1.0.0 - with: - access_token: ${{ secrets.GITHUB_TOKEN }} - unset_labels: 'CI: needs squashing,State: waiting for other PR' - cond_labels: '(Process: needs >1 ACK,review.approvals>1),(Area: RDM,review.approvals>2)' diff --git a/.github/workflows/check-pr.yml b/.github/workflows/check-pr.yml new file mode 100644 index 0000000000..7ba7cc1ddf --- /dev/null +++ b/.github/workflows/check-pr.yml @@ -0,0 +1,39 @@ +name: check-pr +on: + pull_request: + types: [opened, reopened, labeled, unlabeled, synchronize] + pull_request_review: + types: [submitted, dismissed] +jobs: + check-labels: + runs-on: ubuntu-latest + steps: + - uses: RIOT-OS/check-labels-action@v1.0.0 + with: + access_token: ${{ secrets.GITHUB_TOKEN }} + unset_labels: 'CI: needs squashing,State: waiting for other PR' + cond_labels: '(Process: needs >1 ACK,review.approvals>1),(Area: RDM,review.approvals>2)' + check-commits: + runs-on: ubuntu-latest + if: ${{ github.base_ref }} + strategy: + fail-fast: false + matrix: + check: [commit-msg, pr_check] + steps: + - uses: actions/checkout@master + with: + # Use the SHA of the PR branch as-is, not the PR branch merged + # in master (default behavior in GH actions) + # See https://github.com/actions/checkout#checkout-pull-request-head-commit-instead-of-merge-commit + ref: ${{ github.event.pull_request.head.sha }} + fetch-depth: 0 + - name: Fetch base branch + run: + git fetch origin '${{ github.base_ref }}:${{ github.base_ref }}' + - name: Run checks + env: # enforce deactivation of label check in pr_check + TRAVIS_PULL_REQUEST: + CI_PULL_NR: + run: | + ./dist/tools/${{ matrix.check }}/check.sh "${{ github.base_ref }}" diff --git a/dist/tools/ci/static_tests.sh b/dist/tools/ci/static_tests.sh index b9f701a9ea..862ee1f3b1 100755 --- a/dist/tools/ci/static_tests.sh +++ b/dist/tools/ci/static_tests.sh @@ -103,7 +103,6 @@ fi export BASE_BRANCH="${CI_BASE_BRANCH}" -run ./dist/tools/commit-msg/check.sh "${BASE_BRANCH}" run ./dist/tools/whitespacecheck/check.sh "${BASE_BRANCH}" DIFFFILTER="MR" ERROR_EXIT_CODE=0 run ./dist/tools/licenses/check.sh DIFFFILTER="AC" run ./dist/tools/licenses/check.sh @@ -111,7 +110,6 @@ run ./dist/tools/doccheck/check.sh run ./dist/tools/externc/check.sh run ./dist/tools/cppcheck/check.sh run ./dist/tools/vera++/check.sh -run ./dist/tools/pr_check/pr_check.sh "${BASE_BRANCH}" run ./dist/tools/coccinelle/check.sh run ./dist/tools/flake8/check.sh run ./dist/tools/headerguards/check.sh