From b08d413b1ff0e9445b85d373c90dafeaaece2f06 Mon Sep 17 00:00:00 2001 From: Anas Nashif Date: Wed, 20 Nov 2024 19:02:39 -0500 Subject: [PATCH 1/4] ci: twister: convert to 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 4c8b03a5418..a54609668b5 100644 --- a/.github/workflows/twister-prep.yaml +++ b/.github/workflows/twister-prep.yaml @@ -15,7 +15,7 @@ on: 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 f59a3edca3d..4e02047a33e 100644 --- a/.github/workflows/twister-publish.yaml +++ b/.github/workflows/twister-publish.yaml @@ -12,7 +12,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 0fa810b3dd7..6634ebb9a3a 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 @@ -80,7 +80,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" @@ -141,7 +141,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 3fde8e9c6859325a1637d6b1a7404934e0925420 Mon Sep 17 00:00:00 2001 From: Anas Nashif Date: Thu, 21 Nov 2024 07:02:05 -0500 Subject: [PATCH 2/4] start twister after compliance Signed-off-by: Anas Nashif --- .github/workflows/twister.yaml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/twister.yaml b/.github/workflows/twister.yaml index 6634ebb9a3a..f852260821d 100644 --- a/.github/workflows/twister.yaml +++ b/.github/workflows/twister.yaml @@ -1,16 +1,15 @@ name: Run tests with twister on: + workflow_run: + workflows: ["Compliance Checks"] + types: + - completed push: branches: - main - v*-branch - collab-* - pull_request: - branches: - - main - - v*-branch - - collab-* schedule: # Run at 03:00 UTC on every Sunday - cron: '0 3 * * 0' From 8dbde9f4133e25fbd557dacafbeaca2adcd8b443 Mon Sep 17 00:00:00 2001 From: Anas Nashif Date: Thu, 21 Nov 2024 07:29:08 -0500 Subject: [PATCH 3/4] ci: twister: do not check for pr no check Signed-off-by: Anas Nashif --- .github/workflows/twister-prep.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/twister-prep.yaml b/.github/workflows/twister-prep.yaml index a54609668b5..15e57baa1ad 100644 --- a/.github/workflows/twister-prep.yaml +++ b/.github/workflows/twister-prep.yaml @@ -15,7 +15,7 @@ on: jobs: prep_pr: - if: github.repository_owner == 'zephyrproject-rtos' && github.event_name == 'pull_request' + if: github.repository_owner == 'zephyrproject-rtos' && github.event.workflow_run.event == 'pull_request' runs-on: group: zephyr-runner-v2-linux-x64-4xlarge container: From 1603b66d96bc689b2911da26724c4880b77de7fe Mon Sep 17 00:00:00 2001 From: Anas Nashif Date: Fri, 29 Nov 2024 19:55:06 -0500 Subject: [PATCH 4/4] test --- kernel/init.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/kernel/init.c b/kernel/init.c index 0327107129c..97d357d6b02 100644 --- a/kernel/init.c +++ b/kernel/init.c @@ -1,3 +1,5 @@ + + /* * Copyright (c) 2010-2014 Wind River Systems, Inc. *