From ebf02244105f5e399aad0fb5491e388c04b68af1 Mon Sep 17 00:00:00 2001 From: Guennadi Liakhovetski Date: Mon, 21 Jul 2025 10:22:23 +0200 Subject: [PATCH 1/2] ci: switch to ubuntu 24.04 for build tests clang from Ubuntu 22.04 is too old for the current Zephyr, switch to 24.04 for the "stub-build" CI test. Signed-off-by: Guennadi Liakhovetski --- .github/workflows/build_all.yml | 4 ++-- .github/workflows/ipc_fuzzer.yml | 4 ++-- .github/workflows/sparse-zephyr.yml | 2 +- .github/workflows/zephyr-unit-tests.yml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build_all.yml b/.github/workflows/build_all.yml index bfebeaa26954..fba00fbb61f2 100644 --- a/.github/workflows/build_all.yml +++ b/.github/workflows/build_all.yml @@ -11,7 +11,7 @@ on: [pull_request, workflow_dispatch, workflow_call] jobs: stub-build: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 strategy: matrix: # Keep these names short due to questionable Github UI choices @@ -38,7 +38,7 @@ jobs: libasan8:i386 libubsan1:i386 libquadmath0:i386 \ sudo apt-get -y install \ - libc6-dev-i386 libstdc++-12-dev:i386 + libc6-dev-i386 libstdc++-14-dev:i386 - name: apt-get install build tools run: diff --git a/.github/workflows/ipc_fuzzer.yml b/.github/workflows/ipc_fuzzer.yml index 6773af045689..9b21ca03041b 100644 --- a/.github/workflows/ipc_fuzzer.yml +++ b/.github/workflows/ipc_fuzzer.yml @@ -25,7 +25,7 @@ on: jobs: simple-IPC-fuzz_sh: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 strategy: fail-fast: false matrix: @@ -53,7 +53,7 @@ jobs: libasan8:i386 libubsan1:i386 libquadmath0:i386 \ sudo apt-get -y install \ - libc6-dev-i386 libstdc++-12-dev:i386 + libc6-dev-i386 libstdc++-14-dev:i386 - name: apt-get install build tools run: diff --git a/.github/workflows/sparse-zephyr.yml b/.github/workflows/sparse-zephyr.yml index a22e6e8954d5..edb484c42a50 100644 --- a/.github/workflows/sparse-zephyr.yml +++ b/.github/workflows/sparse-zephyr.yml @@ -17,7 +17,7 @@ jobs: # We're sharing the sparse binary with the zephyr-build container so keep # this in sync with it. - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 strategy: fail-fast: false diff --git a/.github/workflows/zephyr-unit-tests.yml b/.github/workflows/zephyr-unit-tests.yml index 4d3f14e8d59b..2db2e7d220af 100644 --- a/.github/workflows/zephyr-unit-tests.yml +++ b/.github/workflows/zephyr-unit-tests.yml @@ -17,7 +17,7 @@ concurrency: jobs: zephyr-utests: name: Zephyr Unit Tests (ZTest) - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 timeout-minutes: 10 steps: From 67b52241b80019950b3d640f65e67d7a70683a15 Mon Sep 17 00:00:00 2001 From: Guennadi Liakhovetski Date: Mon, 21 Jul 2025 10:02:38 +0200 Subject: [PATCH 2/2] west.yml: update to current Zephyr Update to Zephyr commit c99605126cd9 ("llext: only invalidate instruction cache where needed"). Signed-off-by: Guennadi Liakhovetski --- west.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/west.yml b/west.yml index ae60859bc0a8..16418517069e 100644 --- a/west.yml +++ b/west.yml @@ -43,7 +43,7 @@ manifest: - name: zephyr repo-path: zephyr - revision: 9075d5335596080291ebcc448819fed2110dcb9a + revision: c99605126cd9cce5684ddd9ad56aed5292004867 remote: zephyrproject # Import some projects listed in zephyr/west.yml@revision