From bf2045459b31df1367bd6270b036c7393ff8c409 Mon Sep 17 00:00:00 2001 From: Anas Nashif Date: Wed, 20 Nov 2024 19:02:39 -0500 Subject: [PATCH 1/3] ci: twister: convert to pull_request Convert twister workflow to use pull_request. Signed-off-by: Anas Nashif --- .github/workflows/twister-prep.yaml | 2 +- .github/workflows/twister-publish.yaml | 2 +- .github/workflows/twister.yaml | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/twister-prep.yaml b/.github/workflows/twister-prep.yaml index 5ea135ddde4e..5799d776c43b 100644 --- a/.github/workflows/twister-prep.yaml +++ b/.github/workflows/twister-prep.yaml @@ -18,7 +18,7 @@ permissions: jobs: prep_pr: - if: github.repository_owner == 'zephyrproject-rtos' && github.event_name == 'pull_request_target' + if: github.repository_owner == 'zephyrproject-rtos' && github.event_name == 'pull_request' runs-on: group: zephyr-runner-v2-linux-x64-4xlarge container: diff --git a/.github/workflows/twister-publish.yaml b/.github/workflows/twister-publish.yaml index 63433d7569bf..a46df8a977b8 100644 --- a/.github/workflows/twister-publish.yaml +++ b/.github/workflows/twister-publish.yaml @@ -15,7 +15,7 @@ jobs: upload-to-elasticsearch: if: | github.repository == 'zephyrproject-rtos/zephyr' && - github.event.workflow_run.event != 'pull_request_target' + github.event.workflow_run.event != 'pull_request' env: ELASTICSEARCH_KEY: ${{ secrets.ELASTICSEARCH_KEY }} ELASTICSEARCH_SERVER: "https://elasticsearch.zephyrproject.io:443" diff --git a/.github/workflows/twister.yaml b/.github/workflows/twister.yaml index 04f687888b27..90fef7faa648 100644 --- a/.github/workflows/twister.yaml +++ b/.github/workflows/twister.yaml @@ -6,7 +6,7 @@ on: - main - v*-branch - collab-* - pull_request_target: + pull_request: branches: - main - v*-branch @@ -84,7 +84,7 @@ jobs: - name: Environment Setup run: | - if [ "${{github.event_name}}" = "pull_request_target" ]; then + if [ "${{github.event_name}}" = "pull_request" ]; then git config --global user.email "bot@zephyrproject.org" git config --global user.name "Zephyr Builder" rm -fr ".git/rebase-apply" @@ -146,7 +146,7 @@ jobs: fi fi - - if: github.event_name == 'pull_request_target' + - if: github.event_name == 'pull_request' name: Run Tests with Twister (Pull Request) id: run_twister_pr run: | From 05b7fc2cae07de3ee3b237a093d1d61ceb9afaad Mon Sep 17 00:00:00 2001 From: Anas Nashif Date: Tue, 3 Dec 2024 17:46:37 -0500 Subject: [PATCH 2/3] ci: move PR body check to a different workflow Move PR body check to a workflow that monitors editing of PRs. Avoids rerunnin compliance check and other heavy weights workflows on just an edit of the PR body. Signed-off-by: Anas Nashif --- .github/workflows/compliance.yml | 8 -------- .github/workflows/do_not_merge.yml | 20 ++++++++++++++++++-- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/.github/workflows/compliance.yml b/.github/workflows/compliance.yml index 559e315d587f..e6e8389b2228 100644 --- a/.github/workflows/compliance.yml +++ b/.github/workflows/compliance.yml @@ -65,14 +65,6 @@ jobs: west config manifest.group-filter -- +ci,-optional west update -o=--depth=1 -n 2>&1 1> west.update.log || west update -o=--depth=1 -n 2>&1 1> west.update2.log - - name: Check for PR description - if: ${{ github.event.pull_request.body == '' }} - continue-on-error: true - id: pr_description - run: | - echo "Pull request description cannot be empty." - exit 1 - - name: Run Compliance Tests continue-on-error: true id: compliance diff --git a/.github/workflows/do_not_merge.yml b/.github/workflows/do_not_merge.yml index 39275a03f119..2c450efc7d6a 100644 --- a/.github/workflows/do_not_merge.yml +++ b/.github/workflows/do_not_merge.yml @@ -1,8 +1,14 @@ -name: Do Not Merge +name: PR Metadata Check on: pull_request: - types: [synchronize, opened, reopened, labeled, unlabeled] + types: + - synchronize + - opened + - reopened + - labeled + - unlabeled + - edited permissions: contents: read @@ -22,3 +28,13 @@ jobs: echo "Pull request is labeled as 'DNM', 'TSC', 'Architecture Review' or 'dev-review'." echo "This workflow fails so that the pull request cannot be merged." exit 1 + + empty_pr_description: + if: ${{ github.event.pull_request.body == '' }} + name: PR Description + runs-on: ubuntu-22.04 + steps: + - name: Check for PR description + run: | + echo "Pull request description cannot be empty." + exit 1 From f3bca00d47cb8e747b946de98168374d56ea628d Mon Sep 17 00:00:00 2001 From: Anas Nashif Date: Tue, 3 Dec 2024 17:49:15 -0500 Subject: [PATCH 3/3] ci: workflows: rename do_not_merge workflow Add more functionality to the workflow, it is not only about not-merging anymore. Signed-off-by: Anas Nashif --- .github/workflows/{do_not_merge.yml => pr_metadata_check.yml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/workflows/{do_not_merge.yml => pr_metadata_check.yml} (100%) diff --git a/.github/workflows/do_not_merge.yml b/.github/workflows/pr_metadata_check.yml similarity index 100% rename from .github/workflows/do_not_merge.yml rename to .github/workflows/pr_metadata_check.yml