From 96afd8a3bb6761fa15ae9969253a9a2d04966bab Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Sun, 10 Mar 2024 15:59:28 -0400 Subject: [PATCH] CI: Update to using clang-17 Currently, llvm-17 is the stable release. Update our container and CI to fetch and use that. Signed-off-by: Tom Rini --- .azure-pipelines.yml | 6 +++--- .gitlab-ci.yml | 4 ++-- tools/docker/Dockerfile | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index 0a8f49b7bf..f8a3a9a1c8 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -277,16 +277,16 @@ stages: TEST_PY_TEST_SPEC: "version" sandbox_clang: TEST_PY_BD: "sandbox" - OVERRIDE: "-O clang-16" + OVERRIDE: "-O clang-17" sandbox_clang_asan: TEST_PY_BD: "sandbox" - OVERRIDE: "-O clang-16 -a ASAN" + OVERRIDE: "-O clang-17 -a ASAN" TEST_PY_TEST_SPEC: "version" sandbox64: TEST_PY_BD: "sandbox64" sandbox64_clang: TEST_PY_BD: "sandbox64" - OVERRIDE: "-O clang-16" + OVERRIDE: "-O clang-17" sandbox_spl: TEST_PY_BD: "sandbox_spl" TEST_PY_TEST_SPEC: "test_ofplatdata or test_handoff or test_spl" diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b23ece3887..6930b4158e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -251,7 +251,7 @@ sandbox test.py: sandbox with clang test.py: variables: TEST_PY_BD: "sandbox" - OVERRIDE: "-O clang-16" + OVERRIDE: "-O clang-17" <<: *buildman_and_testpy_dfn sandbox64 test.py: @@ -262,7 +262,7 @@ sandbox64 test.py: sandbox64 with clang test.py: variables: TEST_PY_BD: "sandbox64" - OVERRIDE: "-O clang-16" + OVERRIDE: "-O clang-17" <<: *buildman_and_testpy_dfn sandbox_spl test.py: diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile index dae6c24c68..f5968e165c 100644 --- a/tools/docker/Dockerfile +++ b/tools/docker/Dockerfile @@ -12,7 +12,7 @@ ENV DEBIAN_FRONTEND=noninteractive # Add LLVM repository RUN apt-get update && apt-get install -y gnupg2 wget xz-utils && rm -rf /var/lib/apt/lists/* RUN wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - -RUN echo deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-16 main | tee /etc/apt/sources.list.d/llvm.list +RUN echo deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-17 main | tee /etc/apt/sources.list.d/llvm.list # Manually install the kernel.org "Crosstool" based toolchains for gcc-13.2.0 RUN wget -O - https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/13.2.0/x86_64-gcc-13.2.0-nolibc-aarch64-linux.tar.xz | tar -C /opt -xJ @@ -40,7 +40,7 @@ RUN apt-get update && apt-get install -y \ bison \ build-essential \ cgpt \ - clang-16 \ + clang-17 \ coreutils \ cpio \ curl \ -- 2.39.5