Skip to content

Use Zephyr 'main' branch for ci testing #1050

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
keith-packard wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Use Zephyr 'main' branch for ci testing #1050

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e8e1ac8
ci: Use toolchain variant "zephyr" instead of "zephyr/gnu"
keith-packard Dec 16, 2025
9946294
ci: Disable llvm testing until Zephyr is ready
keith-packard Dec 16, 2025
fcf7837
ci: test using Zephyr main
keith-packard Dec 16, 2025
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
14 changes: 9 additions & 5 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ on:
zephyr-ref:
description: 'Zephyr Ref (branch, tag, SHA, ...)'
required: true
default: collab-sdk-dev
default: main
host:
description: 'Host'
type: choice
Expand Down Expand Up @@ -97,7 +97,7 @@ env:
BUG_URL: 'https://github.com/zephyrproject-rtos/sdk-ng/issues'
BUNDLE_NAME: Zephyr SDK
BUNDLE_PREFIX: zephyr-sdk
ZEPHYR_REF: collab-sdk-dev
ZEPHYR_REF: main

jobs:
# Setup
Expand Down Expand Up @@ -1562,7 +1562,7 @@ jobs:
fail-fast: false
matrix:
testenv: ${{ fromJSON(needs.setup.outputs.testenvs) }}
toolchain: [ gnu, llvm ]
toolchain: [ gnu ]
subset: [ 1, 2, 3 ]

env:
Expand Down Expand Up @@ -1715,7 +1715,7 @@ jobs:
popd
else
if [ "${{ matrix.toolchain }}" == "gnu" ]; then
./setup.sh -t all -h -c
./setup.sh -t all -h -c -o
elif [ "${{ matrix.toolchain }}" == "llvm" ]; then
./setup.sh -l -h -c
fi
Expand Down Expand Up @@ -1993,7 +1993,11 @@ jobs:
fi

# Set toolchain variant
export ZEPHYR_TOOLCHAIN_VARIANT=zephyr/${{ matrix.toolchain }}
if [ "${{ matrix.toolchain }}" == "gnu" ]; then
export ZEPHYR_TOOLCHAIN_VARIANT=zephyr
else
export ZEPHYR_TOOLCHAIN_VARIANT=zephyr/${{ matrix.toolchain }}
fi

# Run tests with twister
TWISTER="${ZEPHYR_ROOT}/scripts/twister"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/twister.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ on:
zephyr-ref:
description: 'Zephyr Ref (branch, tag, SHA ...)'
required: true
default: collab-sdk-dev
default: main
twister-mode:
description: 'Twister Mode'
type: choice
Expand Down Expand Up @@ -284,7 +284,7 @@ jobs:
popd
else
if [ "${{ github.event.inputs.sdk-toolchain }}" == "gnu" ]; then
./setup.sh -t all -h -c
./setup.sh -t all -h -c -o
elif [ "${{ github.event.inputs.sdk-toolchain }}" == "llvm" ]; then
./setup.sh -l -h -c
fi
Expand Down
Loading