From 2b2ae5efd7cbcb180bb21c659c8a735389c1639c Mon Sep 17 00:00:00 2001 From: Arnaud Pouliquen Date: Sat, 3 Jun 2023 11:26:07 +0200 Subject: [PATCH 1/2] CI: update checkout action to V3 Node.js 12 actions are deprecated. Use the checkout V3 action to use Node.js 16 Signed-off-by: Arnaud Pouliquen --- .github/workflows/continuous-integration.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index c5a33d28..2efd4809 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -22,7 +22,7 @@ jobs: name: check builds on different platforms runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: build for Linux id: build_linux uses: ./.github/actions/build_ci @@ -48,7 +48,7 @@ jobs: name: nonreg tests runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: configure run: | sudo apt-get update && sudo apt-get install libsysfs-dev From 8e6559f7380dff2b15acd3a6f58bf5046504430d Mon Sep 17 00:00:00 2001 From: Arnaud Pouliquen Date: Sat, 3 Jun 2023 11:53:39 +0200 Subject: [PATCH 2/2] CI: fix zephyr build issue related to the VERSION file The Zephyr cmake fails in version.cmake because some fields are not present in the libmetal VERSION file Add dummy fields for the CI to fix compatibility issue Signed-off-by: Arnaud Pouliquen --- .github/actions/build_ci/entrypoint.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/actions/build_ci/entrypoint.sh b/.github/actions/build_ci/entrypoint.sh index c1a8f779..dd1859ec 100755 --- a/.github/actions/build_ci/entrypoint.sh +++ b/.github/actions/build_ci/entrypoint.sh @@ -80,6 +80,10 @@ build_zephyr(){ cd ../.. && # The prj.conf is mandatory for cmake execution, create a void file. touch prj.conf && + # Add dummy fields in the VERSION file to fix compatibility with Zephyr + # version.cmake file + echo "PATCHLEVEL = 0" >>VERSION && + echo "VERSION_TWEAK = 0" >>VERSION && echo "###### Build for qemu_cortex_m3 ######" && cmake . -DWITH_ZEPHYR=on -DBOARD=qemu_cortex_m3 -DWITH_TESTS=on -Bbuild-zephyr-m3 && cd build-zephyr-m3 &&