Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 11 additions & 6 deletions .github/workflows/compliance.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,20 @@
name: Compliance Checks

on:
pull_request:
types:
- edited
- opened
- reopened
- synchronize
workflow_call:

jobs:
check_compliance_push:
if: github.event_name == 'push'
runs-on: ubuntu-22.04
name: Run compliance checks on patch series (PR)
steps:
- name: Do nothing
run: |
echo "Doing nothing"

check_compliance:
if: github.event_name == 'pull_request'
runs-on: ubuntu-22.04
name: Run compliance checks on patch series (PR)
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/twister-prep.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/twister-publish.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
12 changes: 8 additions & 4 deletions .github/workflows/twister.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
- main
- v*-branch
- collab-*
pull_request_target:
pull_request:
branches:
- main
- v*-branch
Expand All @@ -20,7 +20,11 @@ concurrency:
cancel-in-progress: true

jobs:
compliance-check:
uses: ./.github/workflows/compliance.yml

twister-build-prep:
needs: compliance-check
uses: ./.github/workflows/twister-prep.yaml

twister-build:
Expand Down Expand Up @@ -80,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 "[email protected]"
git config --global user.name "Zephyr Builder"
rm -fr ".git/rebase-apply"
Expand Down Expand Up @@ -133,15 +137,15 @@ jobs:
run: |
export ZEPHYR_BASE=${PWD}
export ZEPHYR_TOOLCHAIN_VARIANT=zephyr
./scripts/twister --subset ${{matrix.subset}}/${{ strategy.job-total }} ${TWISTER_COMMON} ${PUSH_OPTIONS}
./scripts/twister -T tests/kernel/threads --subset ${{matrix.subset}}/${{ strategy.job-total }} ${TWISTER_COMMON} ${PUSH_OPTIONS}
if [ "${{matrix.subset}}" = "1" ]; then
./scripts/zephyr_module.py --twister-out module_tests.args
if [ -s module_tests.args ]; then
./scripts/twister +module_tests.args --outdir module_tests ${TWISTER_COMMON} ${PUSH_OPTIONS}
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: |
Expand Down
1 change: 1 addition & 0 deletions tests/kernel/semaphore/semaphore/src/main.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/*

* Copyright (c) 2016, 2020 Intel Corporation
*
* SPDX-License-Identifier: Apache-2.0
Expand Down
Loading