Skip to content

Commit af2c146

Browse files
tbitcsoz-agent
andcommitted
fix(ci): copy app/ to modules/lib/arbiter/ so Zephyr CMake finds the module
west skips cloning the manifest project to its declared module path; the cp ensures modules/lib/arbiter/ exists with the correct content and is captured in the west workspace cache for subsequent runs. Drop ZEPHYR_EXTRA_MODULES which was not resolving the missing Kconfig issue. Co-Authored-By: Oz <oz-agent@warp.dev>
1 parent d2dd9f0 commit af2c146

1 file changed

Lines changed: 12 additions & 3 deletions

File tree

.github/workflows/ci.yml

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,6 @@ jobs:
6161
env:
6262
# native_sim uses host GCC; skip cross-compiler toolchain lookup.
6363
ZEPHYR_TOOLCHAIN_VARIANT: host
64-
# app/ is the arbiter module checkout; register it as an extra module
65-
# so Zephyr CMake loads its Kconfig and cmake files.
66-
ZEPHYR_EXTRA_MODULES: ${{ github.workspace }}/app
6764
steps:
6865
- uses: actions/checkout@v4
6966
with:
@@ -106,6 +103,18 @@ jobs:
106103
if: steps.cache-west.outputs.cache-hit != 'true'
107104
run: west update --narrow -o=--depth=1
108105

106+
# west treats the manifest project as already-present at app/ and will
107+
# NOT clone it to modules/lib/arbiter/ (its declared path). Copy it
108+
# there so Zephyr CMake can discover the module's Kconfig + cmake files.
109+
# This runs only on cache miss so the copy ends up in the restored cache.
110+
- name: Place arbiter at canonical module path
111+
if: steps.cache-west.outputs.cache-hit != 'true'
112+
run: |
113+
mkdir -p modules/lib
114+
if [ ! -d modules/lib/arbiter ]; then
115+
cp -rp app modules/lib/arbiter
116+
fi
117+
109118
- name: Install Zephyr Python requirements
110119
run: pip install -r zephyr/scripts/requirements.txt
111120

0 commit comments

Comments
 (0)