From f5e892749b82f2b2e3dc9e343205a37a21fb2f88 Mon Sep 17 00:00:00 2001 From: Stephanos Ioannidis Date: Thu, 8 Sep 2022 20:28:34 +0900 Subject: [PATCH 1/9] cmake: clang: Disable deprecated non-prototype warning Clang 15 added a new warning type `-Wdeprecated-non-prototype` that warns about the functions without prototypes, which have been deprecated since the C89 and will not work in the upcoming C2x. This commit disables the warning because Zephyr deliberately makes use of the functions without prototypes to allow the use of a "generic" function pointer (notoriously in the cbprintf implementation) and Zephyr will not move to the C2x in the foreseeable future. Signed-off-by: Stephanos Ioannidis --- cmake/compiler/clang/compiler_flags.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/cmake/compiler/clang/compiler_flags.cmake b/cmake/compiler/clang/compiler_flags.cmake index f4d5a6530173f..ce0c8b17fe966 100644 --- a/cmake/compiler/clang/compiler_flags.cmake +++ b/cmake/compiler/clang/compiler_flags.cmake @@ -29,6 +29,7 @@ check_set_compiler_property(PROPERTY warning_base -Wno-main -Wno-unused-but-set-variable -Wno-typedef-redefinition + -Wno-deprecated-non-prototype ) check_set_compiler_property(APPEND PROPERTY warning_base -Wno-pointer-sign) From 65bef7f2ba2ec24e556a07d8b5093205d7c7158f Mon Sep 17 00:00:00 2001 From: Stephanos Ioannidis Date: Thu, 8 Sep 2022 22:20:40 +0900 Subject: [PATCH 2/9] ci: twister: Remove stale clang-related variables This commit removes stale clang-related variables that are not used by the Twister workflow. Signed-off-by: Stephanos Ioannidis --- .github/workflows/twister.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/twister.yaml b/.github/workflows/twister.yaml index 9fc8271c165a4..6871f93242b05 100644 --- a/.github/workflows/twister.yaml +++ b/.github/workflows/twister.yaml @@ -40,7 +40,6 @@ jobs: PUSH_MATRIX_SIZE: 15 DAILY_MATRIX_SIZE: 80 ZEPHYR_SDK_INSTALL_DIR: /opt/toolchains/zephyr-sdk-0.15.0 - CLANG_ROOT_DIR: /usr/lib/llvm-12 TESTS_PER_BUILDER: 700 COMMIT_RANGE: ${{ github.event.pull_request.base.sha }}..${{ github.event.pull_request.head.sha }} BASE_REF: ${{ github.base_ref }} @@ -130,7 +129,6 @@ jobs: subset: ${{fromJSON(needs.twister-build-prep.outputs.subset)}} env: ZEPHYR_SDK_INSTALL_DIR: /opt/toolchains/zephyr-sdk-0.15.0 - CLANG_ROOT_DIR: /usr/lib/llvm-12 TWISTER_COMMON: ' --force-color --inline-logs -v -N -M --retry-failed 3 ' DAILY_OPTIONS: ' -M --build-only --all' PR_OPTIONS: ' --clobber-output --integration' @@ -177,7 +175,6 @@ jobs: - name: Check Environment run: | cmake --version - ${CLANG_ROOT_DIR}/bin/clang --version gcc --version ls -la echo "github.ref: ${{ github.ref }}" From 0834bcfa72cf2924dc40402bff8fb1b7c8e6c80b Mon Sep 17 00:00:00 2001 From: Stephanos Ioannidis Date: Thu, 8 Sep 2022 22:22:18 +0900 Subject: [PATCH 3/9] ci: codecov: Remove stale clang-related variables This commit removes stale clang-related variables that are not used by the codecov workflow. Signed-off-by: Stephanos Ioannidis --- .github/workflows/codecov.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/codecov.yaml b/.github/workflows/codecov.yaml index a3011f9df4b45..fde74914f66fd 100644 --- a/.github/workflows/codecov.yaml +++ b/.github/workflows/codecov.yaml @@ -26,7 +26,6 @@ jobs: platform: ["native_posix", "qemu_x86", "unit_testing"] env: ZEPHYR_SDK_INSTALL_DIR: /opt/toolchains/zephyr-sdk-0.15.0 - CLANG_ROOT_DIR: /usr/lib/llvm-12 steps: - name: Apply container owner mismatch workaround run: | @@ -53,7 +52,6 @@ jobs: - name: Check Environment run: | cmake --version - ${CLANG_ROOT_DIR}/bin/clang --version gcc --version ls -la - name: Prepare ccache keys From 2c3963d129873a35b9edef69ae8d9b8117c67e2c Mon Sep 17 00:00:00 2001 From: Stephanos Ioannidis Date: Fri, 9 Sep 2022 00:24:59 +0900 Subject: [PATCH 4/9] ci: bluetooth-tests: Remove stale clang-related variables This commit removes stale clang-related variables that are not used by the bluetooth-tests workflow. Signed-off-by: Stephanos Ioannidis --- .github/workflows/bluetooth-tests.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/bluetooth-tests.yaml b/.github/workflows/bluetooth-tests.yaml index c3ef2d83ea941..d0727d7c8a2a4 100644 --- a/.github/workflows/bluetooth-tests.yaml +++ b/.github/workflows/bluetooth-tests.yaml @@ -28,7 +28,6 @@ jobs: env: ZEPHYR_TOOLCHAIN_VARIANT: zephyr ZEPHYR_SDK_INSTALL_DIR: /opt/toolchains/zephyr-sdk-0.15.0 - CLANG_ROOT_DIR: /usr/lib/llvm-12 BSIM_OUT_PATH: /opt/bsim/ BSIM_COMPONENTS_PATH: /opt/bsim/components EDTT_PATH: ../tools/edtt From d5cf6ee8028620969d6259fd67437c7604504dd7 Mon Sep 17 00:00:00 2001 From: Stephanos Ioannidis Date: Fri, 9 Sep 2022 00:25:32 +0900 Subject: [PATCH 5/9] ci: footprint-tracking: Remove stale clang-related variables This commit removes stale clang-related variables that are not used by the footprint-tracking workflow. Signed-off-by: Stephanos Ioannidis --- .github/workflows/footprint-tracking.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/footprint-tracking.yml b/.github/workflows/footprint-tracking.yml index a96de48f4d3e3..60017e5e3af42 100644 --- a/.github/workflows/footprint-tracking.yml +++ b/.github/workflows/footprint-tracking.yml @@ -33,7 +33,6 @@ jobs: fail-fast: false env: ZEPHYR_SDK_INSTALL_DIR: /opt/toolchains/zephyr-sdk-0.15.0 - CLANG_ROOT_DIR: /usr/lib/llvm-12 ZEPHYR_TOOLCHAIN_VARIANT: zephyr steps: - name: Apply container owner mismatch workaround From 771f539ee6f0773a7b04fe329d3dd4db5c13539d Mon Sep 17 00:00:00 2001 From: Stephanos Ioannidis Date: Fri, 9 Sep 2022 00:25:56 +0900 Subject: [PATCH 6/9] ci: footprint: Remove stale clang-related variables This commit removes stale clang-related variables that are not used by the footprint workflow. Signed-off-by: Stephanos Ioannidis --- .github/workflows/footprint.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/footprint.yml b/.github/workflows/footprint.yml index a0943c1753b67..db5eef06377aa 100644 --- a/.github/workflows/footprint.yml +++ b/.github/workflows/footprint.yml @@ -22,7 +22,6 @@ jobs: fail-fast: false env: ZEPHYR_SDK_INSTALL_DIR: /opt/toolchains/zephyr-sdk-0.15.0 - CLANG_ROOT_DIR: /usr/lib/llvm-12 ZEPHYR_TOOLCHAIN_VARIANT: zephyr steps: - name: Cancel Previous Runs From 1bb5568212e1f1b58585f70be1cada15ae46c085 Mon Sep 17 00:00:00 2001 From: Stephanos Ioannidis Date: Fri, 9 Sep 2022 00:27:11 +0900 Subject: [PATCH 7/9] ci: clang: Use LLVM_TOOLCHAIN_PATH instead of CLANG_ROOT_DIR `CLANG_ROOT_DIR` is deprecated; use `LLVM_TOOLCHAIN_PATH` instead. Signed-off-by: Stephanos Ioannidis --- .github/workflows/clang.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/clang.yaml b/.github/workflows/clang.yaml index d315d1daf49ed..4d9d25f3c7a36 100644 --- a/.github/workflows/clang.yaml +++ b/.github/workflows/clang.yaml @@ -24,7 +24,7 @@ jobs: platform: ["native_posix"] env: ZEPHYR_SDK_INSTALL_DIR: /opt/toolchains/zephyr-sdk-0.15.0 - CLANG_ROOT_DIR: /usr/lib/llvm-12 + LLVM_TOOLCHAIN_PATH: /usr/lib/llvm-12 COMMIT_RANGE: ${{ github.event.pull_request.base.sha }}..${{ github.event.pull_request.head.sha }} BASE_REF: ${{ github.base_ref }} outputs: @@ -69,7 +69,7 @@ jobs: - name: Check Environment run: | cmake --version - ${CLANG_ROOT_DIR}/bin/clang --version + ${LLVM_TOOLCHAIN_PATH}/bin/clang --version gcc --version ls -la From 12d3236c8c4ca24dcd6e42e471176a7e916d6d32 Mon Sep 17 00:00:00 2001 From: Stephanos Ioannidis Date: Thu, 8 Sep 2022 22:28:19 +0900 Subject: [PATCH 8/9] ci: Switch to CI image 0.24.3 This commit updates the CI workflows to use the CI image 0.24.3, in order to pull in the LLVM/Clang 15 and Renode 1.13.1. Signed-off-by: Stephanos Ioannidis --- .github/workflows/bluetooth-tests.yaml | 2 +- .github/workflows/clang.yaml | 2 +- .github/workflows/codecov.yaml | 2 +- .github/workflows/errno.yml | 2 +- .github/workflows/footprint-tracking.yml | 2 +- .github/workflows/footprint.yml | 2 +- .github/workflows/twister.yaml | 4 ++-- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/bluetooth-tests.yaml b/.github/workflows/bluetooth-tests.yaml index d0727d7c8a2a4..85eae1728f628 100644 --- a/.github/workflows/bluetooth-tests.yaml +++ b/.github/workflows/bluetooth-tests.yaml @@ -23,7 +23,7 @@ jobs: runs-on: ubuntu-20.04 needs: bluetooth-test-prep container: - image: ghcr.io/zephyrproject-rtos/ci:v0.24.2 + image: ghcr.io/zephyrproject-rtos/ci:v0.24.3 options: '--entrypoint /bin/bash' env: ZEPHYR_TOOLCHAIN_VARIANT: zephyr diff --git a/.github/workflows/clang.yaml b/.github/workflows/clang.yaml index 4d9d25f3c7a36..b2b7f7b306324 100644 --- a/.github/workflows/clang.yaml +++ b/.github/workflows/clang.yaml @@ -14,7 +14,7 @@ jobs: runs-on: zephyr_runner needs: clang-build-prep container: - image: ghcr.io/zephyrproject-rtos/ci:v0.24.2 + image: ghcr.io/zephyrproject-rtos/ci:v0.24.3 options: '--entrypoint /bin/bash' volumes: - /home/runners/zephyrproject:/github/cache/zephyrproject diff --git a/.github/workflows/codecov.yaml b/.github/workflows/codecov.yaml index fde74914f66fd..3f7d6003f3a20 100644 --- a/.github/workflows/codecov.yaml +++ b/.github/workflows/codecov.yaml @@ -18,7 +18,7 @@ jobs: runs-on: zephyr_runner needs: codecov-prep container: - image: ghcr.io/zephyrproject-rtos/ci:v0.24.2 + image: ghcr.io/zephyrproject-rtos/ci:v0.24.3 options: '--entrypoint /bin/bash' strategy: fail-fast: false diff --git a/.github/workflows/errno.yml b/.github/workflows/errno.yml index 07c1724f35e03..6ad5f02f7f45d 100644 --- a/.github/workflows/errno.yml +++ b/.github/workflows/errno.yml @@ -10,7 +10,7 @@ jobs: check-errno: runs-on: ubuntu-20.04 container: - image: ghcr.io/zephyrproject-rtos/ci:v0.24.2 + image: ghcr.io/zephyrproject-rtos/ci:v0.24.3 env: ZEPHYR_SDK_INSTALL_DIR: /opt/toolchains/zephyr-sdk-0.15.0 diff --git a/.github/workflows/footprint-tracking.yml b/.github/workflows/footprint-tracking.yml index 60017e5e3af42..c195e300c2e33 100644 --- a/.github/workflows/footprint-tracking.yml +++ b/.github/workflows/footprint-tracking.yml @@ -27,7 +27,7 @@ jobs: if: github.repository == 'zephyrproject-rtos/zephyr' needs: footprint-tracking-cancel container: - image: ghcr.io/zephyrproject-rtos/ci:v0.24.2 + image: ghcr.io/zephyrproject-rtos/ci:v0.24.3 options: '--entrypoint /bin/bash' strategy: fail-fast: false diff --git a/.github/workflows/footprint.yml b/.github/workflows/footprint.yml index db5eef06377aa..f2486e1eca165 100644 --- a/.github/workflows/footprint.yml +++ b/.github/workflows/footprint.yml @@ -16,7 +16,7 @@ jobs: if: github.repository == 'zephyrproject-rtos/zephyr' needs: footprint-cancel container: - image: ghcr.io/zephyrproject-rtos/ci:v0.24.2 + image: ghcr.io/zephyrproject-rtos/ci:v0.24.3 options: '--entrypoint /bin/bash' strategy: fail-fast: false diff --git a/.github/workflows/twister.yaml b/.github/workflows/twister.yaml index 6871f93242b05..267a45d8574ac 100644 --- a/.github/workflows/twister.yaml +++ b/.github/workflows/twister.yaml @@ -27,7 +27,7 @@ jobs: runs-on: zephyr_runner needs: twister-build-cleanup container: - image: ghcr.io/zephyrproject-rtos/ci:v0.24.2 + image: ghcr.io/zephyrproject-rtos/ci:v0.24.3 options: '--entrypoint /bin/bash' volumes: - /home/runners/zephyrproject:/github/cache/zephyrproject @@ -119,7 +119,7 @@ jobs: needs: twister-build-prep if: needs.twister-build-prep.outputs.size != 0 container: - image: ghcr.io/zephyrproject-rtos/ci:v0.24.2 + image: ghcr.io/zephyrproject-rtos/ci:v0.24.3 options: '--entrypoint /bin/bash' volumes: - /home/runners/zephyrproject:/github/cache/zephyrproject From 37d6bf8f356c1749c8c32d77d6edf531b5927f37 Mon Sep 17 00:00:00 2001 From: Stephanos Ioannidis Date: Fri, 9 Sep 2022 00:28:41 +0900 Subject: [PATCH 9/9] ci: clang: Use Clang 15 This commit updates the Clang workflow to build tests using Clang 15. Signed-off-by: Stephanos Ioannidis --- .github/workflows/clang.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/clang.yaml b/.github/workflows/clang.yaml index b2b7f7b306324..e123ca10c5910 100644 --- a/.github/workflows/clang.yaml +++ b/.github/workflows/clang.yaml @@ -24,7 +24,7 @@ jobs: platform: ["native_posix"] env: ZEPHYR_SDK_INSTALL_DIR: /opt/toolchains/zephyr-sdk-0.15.0 - LLVM_TOOLCHAIN_PATH: /usr/lib/llvm-12 + LLVM_TOOLCHAIN_PATH: /usr/lib/llvm-15 COMMIT_RANGE: ${{ github.event.pull_request.base.sha }}..${{ github.event.pull_request.head.sha }} BASE_REF: ${{ github.base_ref }} outputs: