From 6880fe4948121ad121ea3341f4c0f8ab082139d0 Mon Sep 17 00:00:00 2001
From: Sebastian Pipping <sebastian@pipping.org>
Date: Fri, 26 Jan 2024 15:24:28 +0100
Subject: [PATCH] CI: Upgrade to Clang 18 (except clang-tidy and clang-format)

---
 .ci.sh                        |  2 +-
 .github/workflows/fuzzing.yml | 12 ++++++------
 .github/workflows/linux.yml   |  8 ++++----
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.ci.sh b/.ci.sh
index 083f2930..64b680cc 100755
--- a/.ci.sh
+++ b/.ci.sh
@@ -39,7 +39,7 @@ if [[ ${RUNNER_OS} = macOS ]]; then
     export PATH="/usr/local/opt/coreutils/libexec/gnubin${PATH:+:}${PATH}"
     export PATH="/usr/local/opt/findutils/libexec/gnubin${PATH:+:}${PATH}"
 elif [[ ${RUNNER_OS} = Linux ]]; then
-    export PATH="/usr/lib/llvm-17/bin:${PATH}"
+    export PATH="/usr/lib/llvm-18/bin:${PATH}"
 else
     echo "Unsupported RUNNER_OS \"${RUNNER_OS}\"." >&2
     exit 1
diff --git a/.github/workflows/fuzzing.yml b/.github/workflows/fuzzing.yml
index 236bdadc..85e41f8f 100644
--- a/.github/workflows/fuzzing.yml
+++ b/.github/workflows/fuzzing.yml
@@ -46,18 +46,18 @@ jobs:
     steps:
     - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11  # v4.1.1
 
-    - name: Install Clang 17
+    - name: Install Clang 18
       run: |-
         set -x
         source /etc/os-release
         wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
-        sudo add-apt-repository "deb https://apt.llvm.org/${UBUNTU_CODENAME}/ llvm-toolchain-${UBUNTU_CODENAME}-17 main"
+        sudo add-apt-repository "deb https://apt.llvm.org/${UBUNTU_CODENAME}/ llvm-toolchain-${UBUNTU_CODENAME}-18 main"
         sudo apt-get update  # due to new repository
         sudo apt-get install --yes --no-install-recommends -V \
-            clang-17 \
-            libclang-rt-17-dev \
-            llvm-17
-        echo /usr/lib/llvm-17/bin >>"${GITHUB_PATH}"
+            clang-18 \
+            libclang-rt-18-dev \
+            llvm-18
+        echo /usr/lib/llvm-18/bin >>"${GITHUB_PATH}"
 
     - name: Build Expat fuzzers
       run: |
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index ee060ffd..f71ccc5b 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -118,12 +118,12 @@ jobs:
         set -x
         source /etc/os-release
         wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
-        sudo add-apt-repository "deb https://apt.llvm.org/${UBUNTU_CODENAME}/ llvm-toolchain-${UBUNTU_CODENAME}-17 main"
+        sudo add-apt-repository "deb https://apt.llvm.org/${UBUNTU_CODENAME}/ llvm-toolchain-${UBUNTU_CODENAME}-18 main"
         sudo apt-get update  # due to new repository
-        # NOTE: Please note the version-specific ${PATH} extension for Clang adding /usr/lib/llvm-17/bin in .ci.sh
+        # NOTE: Please note the version-specific ${PATH} extension for Clang adding /usr/lib/llvm-18/bin in .ci.sh
         sudo apt-get install --yes --no-install-recommends -V \
-            clang-17 \
-            libclang-rt-17-dev
+            clang-18 \
+            libclang-rt-18-dev
     - name: Install build dependencies (common)
       run: |-
         sudo apt-get install --yes --no-install-recommends -V \