From 8a7a8f6116952bdccb36ee00fe662a81828ec9e7 Mon Sep 17 00:00:00 2001 From: MikePopoloski Date: Sat, 16 Mar 2024 14:31:27 -0400 Subject: [PATCH] Update CI build to use clang-18 --- .github/workflows/build.yml | 4 ++-- CMakePresets.json | 13 +++++++------ 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index afa8eff92..b45622e06 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -40,10 +40,10 @@ jobs: if: matrix.os == 'ubuntu-22.04' run: | wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add - - sudo add-apt-repository "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-17 main" + sudo add-apt-repository "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-18 main" sudo add-apt-repository ppa:ubuntu-toolchain-r/test sudo apt-get update - sudo apt-get install -y g++-13 g++-11 clang-17 clang-tidy-17 + sudo apt-get install -y g++-13 g++-11 clang-18 clang-tidy-18 - uses: ilammy/msvc-dev-cmd@v1 if: matrix.os == 'windows-latest' - uses: maxim-lobanov/setup-xcode@v1 diff --git a/CMakePresets.json b/CMakePresets.json index 6e1c093d2..27b896b66 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -97,7 +97,8 @@ "name": "clang-flags", "hidden": true, "cacheVariables": { - "SLANG_WARN_FLAGS": "-Wall;-Wextra;-Werror;-Warray-bounds-pointer-arithmetic;-Wassign-enum;-Wbad-function-cast;-Wcast-qual;-Wchar-subscripts;-Wcomma;-Wconditional-uninitialized;-Wconversion;-Wdelete-non-virtual-dtor;-Wdeprecated;-Wduplicate-enum;-Wduplicate-method-arg;-Wembedded-directive;-Wfor-loop-analysis;-Wformat-pedantic;-Widiomatic-parentheses;-Wimplicit-fallthrough;-Wpedantic;-Wrange-loop-analysis;-Wredundant-parens;-Wreserved-id-macro;-Wshadow;-Wundefined-reinterpret-cast;-Wunreachable-code-aggressive;-Wno-missing-braces;-Wno-deprecated-literal-operator" + "SLANG_WARN_FLAGS": "-Wall;-Wextra;-Werror;-Warray-bounds-pointer-arithmetic;-Wassign-enum;-Wbad-function-cast;-Wcast-qual;-Wchar-subscripts;-Wcomma;-Wconditional-uninitialized;-Wconversion;-Wdelete-non-virtual-dtor;-Wdeprecated;-Wduplicate-enum;-Wduplicate-method-arg;-Wembedded-directive;-Wfor-loop-analysis;-Wformat-pedantic;-Widiomatic-parentheses;-Wimplicit-fallthrough;-Wpedantic;-Wrange-loop-analysis;-Wredundant-parens;-Wreserved-id-macro;-Wshadow;-Wundefined-reinterpret-cast;-Wunreachable-code-aggressive;-Wno-missing-braces;-Wno-deprecated-literal-operator", + "CMAKE_CXX_FLAGS": "-Wno-deprecated-declarations" } }, { @@ -121,7 +122,7 @@ ], "cacheVariables": { "CMAKE_BUILD_TYPE": "Debug", - "CMAKE_CXX_COMPILER": "clang++-17" + "CMAKE_CXX_COMPILER": "clang++-18" } }, { @@ -133,7 +134,7 @@ ], "cacheVariables": { "CMAKE_BUILD_TYPE": "Release", - "CMAKE_CXX_COMPILER": "clang++-17" + "CMAKE_CXX_COMPILER": "clang++-18" } }, { @@ -146,11 +147,11 @@ ], "cacheVariables": { "CMAKE_BUILD_TYPE": "RelWithDebInfo", - "CMAKE_CXX_COMPILER": "clang++-17", - "CMAKE_CXX_FLAGS": "-fsanitize=undefined,address -fno-sanitize-recover=undefined -fno-omit-frame-pointer -fno-common", + "CMAKE_CXX_COMPILER": "clang++-18", + "CMAKE_CXX_FLAGS": "-fsanitize=undefined,address -fno-sanitize-recover=undefined -fno-omit-frame-pointer -fno-common -Wno-deprecated-declarations", "CMAKE_EXE_LINKER_FLAGS": "-fsanitize=undefined,address -fno-sanitize-recover=undefined", "CMAKE_SHARED_LINKER_FLAGS": "-fsanitize=undefined,address -fno-sanitize-recover=undefined", - "SLANG_CLANG_TIDY": "clang-tidy-17" + "SLANG_CLANG_TIDY": "clang-tidy-18" } }, {