From e8e1ac8b534738d5e78ae8543b011355b478c71c Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Mon, 15 Dec 2025 19:48:55 -0800 Subject: [PATCH 1/3] ci: Use toolchain variant "zephyr" instead of "zephyr/gnu" This preserves compatibility with existing Zephyr code. Signed-off-by: Keith Packard --- .github/workflows/ci.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 788d93c1..709d492b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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" From 9946294cd34852d7a2a13acfaa0aef0737e9dd73 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Mon, 15 Dec 2025 19:49:47 -0800 Subject: [PATCH 2/3] ci: Disable llvm testing until Zephyr is ready This allows testing against zephyr/main which doesn't have zephyr/llvm support yet. Signed-off-by: Keith Packard --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 709d492b..2b015444 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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: From fcf7837132da014e32f1a6211bfbe237e7e930e2 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Mon, 15 Dec 2025 19:39:43 -0800 Subject: [PATCH 3/3] ci: test using Zephyr main Switch zephyr test branch target to 'main' to verify that the gnu toolchain is ready for use. This requires use of the setup.sh '-o' option which provides a SDK directory structure which is compatible with older SDK versions. Signed-off-by: Keith Packard --- .github/workflows/ci.yml | 6 +++--- .github/workflows/twister.yml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2b015444..667ad546 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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 @@ -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 @@ -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 diff --git a/.github/workflows/twister.yml b/.github/workflows/twister.yml index 2e45b0a2..53368a60 100644 --- a/.github/workflows/twister.yml +++ b/.github/workflows/twister.yml @@ -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 @@ -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