Update CI builds to xcode 15, gcc-13, clang-17

MikePopoloski · Sep 23, 2023 · 90981c0 · 90981c0
1 parent 1d23113
commit 90981c0
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 13 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -40,15 +40,16 @@ 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-16 main"
+        sudo add-apt-repository "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-17 main"
+        sudo add-apt-repository ppa:ubuntu-toolchain-r/test
         sudo apt-get update
-        sudo apt-get install -y g++-12 g++-10 clang-16 clang-tidy-16
+        sudo apt-get install -y g++-13 g++-10 clang-17 clang-tidy-17
     - uses: ilammy/msvc-dev-cmd@v1
       if: matrix.os == 'windows-latest'
     - uses: maxim-lobanov/setup-xcode@v1
       if: matrix.os == 'macos-13'
       with:
-        xcode-version: '14.3'
+        xcode-version: 'latest'
     - name: Configure
       run: cmake --preset ${{ matrix.preset }} -DSLANG_CI_BUILD=ON
     - name: Build
@@ -64,8 +65,9 @@ jobs:
         fetch-depth: 0
     - name: Install dependencies
       run: |
+        sudo add-apt-repository ppa:ubuntu-toolchain-r/test
         sudo apt-get update
-        sudo apt-get install -y g++-12 lcov
+        sudo apt-get install -y g++-13 lcov
     - name: Configure
       run: cmake --preset=ci-coverage
     - name: Build

diff --git a/CMakePresets.json b/CMakePresets.json
@@ -121,7 +121,7 @@
       ],
       "cacheVariables": {
         "CMAKE_BUILD_TYPE": "Debug",
-        "CMAKE_CXX_COMPILER": "clang++-16"
+        "CMAKE_CXX_COMPILER": "clang++-17"
       }
     },
     {
@@ -133,7 +133,7 @@
       ],
       "cacheVariables": {
         "CMAKE_BUILD_TYPE": "Release",
-        "CMAKE_CXX_COMPILER": "clang++-16"
+        "CMAKE_CXX_COMPILER": "clang++-17"
       }
     },
     {
@@ -146,11 +146,11 @@
       ],
       "cacheVariables": {
         "CMAKE_BUILD_TYPE": "RelWithDebInfo",
-        "CMAKE_CXX_COMPILER": "clang++-16",
+        "CMAKE_CXX_COMPILER": "clang++-17",
         "CMAKE_CXX_FLAGS": "-fsanitize=undefined,address -fno-sanitize-recover=undefined -fno-omit-frame-pointer -fno-common",
         "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-16"
+        "SLANG_CLANG_TIDY": "clang-tidy-17"
       }
     },
     {
@@ -162,7 +162,7 @@
       ],
       "cacheVariables": {
         "CMAKE_BUILD_TYPE": "Debug",
-        "CMAKE_CXX_COMPILER": "g++-12",
+        "CMAKE_CXX_COMPILER": "g++-13",
         "BUILD_SHARED_LIBS": "ON"
       }
     },
@@ -176,7 +176,7 @@
       "cacheVariables": {
         "CMAKE_BUILD_TYPE": "Debug",
         "CMAKE_CXX_FLAGS": "-fno-exceptions -fno-rtti",
-        "CMAKE_CXX_COMPILER": "g++-12"
+        "CMAKE_CXX_COMPILER": "g++-13"
       }
     },
     {
@@ -188,7 +188,7 @@
       ],
       "cacheVariables": {
         "CMAKE_BUILD_TYPE": "Release",
-        "CMAKE_CXX_COMPILER": "g++-12"
+        "CMAKE_CXX_COMPILER": "g++-13"
       }
     },
     {
@@ -211,12 +211,12 @@
       ],
       "cacheVariables": {
         "CMAKE_BUILD_TYPE": "Coverage",
-        "CMAKE_CXX_COMPILER": "g++-12",
+        "CMAKE_CXX_COMPILER": "g++-13",
         "CMAKE_CXX_FLAGS_COVERAGE": "-Og -g --coverage -DSLANG_ASSERT_ENABLED=0 -fno-omit-frame-pointer -fno-optimize-sibling-calls -fno-inline -fno-inline-small-functions -fno-default-inline",
         "CMAKE_EXE_LINKER_FLAGS_COVERAGE": "--coverage",
         "CMAKE_SHARED_LINKER_FLAGS_COVERAGE": "--coverage",
         "SLANG_INCLUDE_COVERAGE": "ON",
-        "COVERAGE_GCOV_TOOL": "gcov-12"
+        "COVERAGE_GCOV_TOOL": "gcov-13"
       }
     },
     {