From 7e231b098a1ff21e7ac2667b3c9bb0903dab8e4d Mon Sep 17 00:00:00 2001 From: Anas Nashif Date: Sat, 24 May 2025 11:08:20 -0400 Subject: [PATCH 1/2] workaround for issue wih gdb/mingw With new sdk-build docker used for llvm builds, building gdb fails for gnu toolchains, go back to old versions of mingw toolchains when build gnu toolchain for now. Signed-off-by: Anas Nashif --- .github/workflows/ci.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3f6f208c..4d9e45f1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -492,8 +492,11 @@ jobs: # Install dependencies for cross compilation if [ "${{ matrix.host.name }}" == "windows-x86_64" ]; then # Make MinGW-w64 win32 cross toolchain available in PATH - echo "/opt/mingw-w64-win32/bin" >> $GITHUB_PATH - export PATH="/opt/mingw-w64-win32/bin:$PATH" + #echo "/opt/mingw-w64-win32/bin" >> $GITHUB_PATH + #export PATH="/opt/mingw-w64-win32/bin:$PATH" + # Install MinGW-w64 cross toolchain + sudo apt-get install -y binutils-mingw-w64 gcc-mingw-w64 \ + g++-mingw-w64 # Build and install libboost-regex for MinGW-w64 host ## Check out Boost library source code From b7b649f1549735ea66ddf7a28871a8b8582fb7de Mon Sep 17 00:00:00 2001 From: Anas Nashif Date: Sun, 25 May 2025 08:08:08 -0400 Subject: [PATCH 2/2] ci: move to use collab-sdk-dev branch for testing Move to using collab-sdk-dev branch instead of version locked branch. Signed-off-by: Anas Nashif --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4d9e45f1..cc61bb82 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-0.18-dev + default: collab-sdk-dev host: description: 'Host' type: choice @@ -93,7 +93,7 @@ env: BUG_URL: 'https://github.com/zephyrproject-rtos/sdk-ng/issues' BUNDLE_NAME: Zephyr SDK BUNDLE_PREFIX: zephyr-sdk - ZEPHYR_REF: collab-sdk-0.18-dev + ZEPHYR_REF: collab-sdk-dev jobs: # Setup