2022 is old

Chatterino · Feb 3, 2025 · e8d5d9c · e8d5d9c
1 parent 142e14e
commit e8d5d9c
Showing 1 changed file with 7 additions and 8 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -60,7 +60,6 @@ jobs:
       C2_ENABLE_LTO: ${{ matrix.force-lto }}
       C2_PLUGINS: ${{ matrix.plugins }}
       C2_ENABLE_CRASHPAD: ${{ matrix.skip-crashpad == false }}
-      C2_CLANG_VERSION: ${{matrix.os == 'ubuntu-22.04' && '15' || '18'}}
 
     steps:
       - uses: actions/checkout@v4
@@ -72,15 +71,15 @@ jobs:
         run: |
           git config --global --add safe.directory '*'
 
-      - name: Install Python and libclang (22.04+)
-        if: matrix.os != 'ubuntu-20.04'
+      - name: Install Python and libclang (24.04)
+        if: matrix.os == 'ubuntu-24.04'
         run: |
           sudo apt update
           sudo DEBIAN_FRONTEND=noninteractive apt -y --no-install-recommends install \
-            python3 python3-venv clang-$C2_CLANG_VERSION clang-format-$C2_CLANG_VERSION libclang-$C2_CLANG_VERSION-dev
-          echo "LIBCLANG_LIBRARY_FILE=/usr/lib/x86_64-linux-gnu/libclang-$C2_CLANG_VERSION.so" >> "$GITHUB_ENV"
-          sudo update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-$C2_CLANG_VERSION 42
-          sudo update-alternatives --install /usr/bin/clang-format clang-format /usr/bin/clang-format-$C2_CLANG_VERSION 42
+            python3 python3-venv clang-18 clang-format-18 libclang-18-dev
+          echo "LIBCLANG_LIBRARY_FILE=/usr/lib/x86_64-linux-gnu/libclang-18.so" >> "$GITHUB_ENV"
+          sudo update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-18 42
+          sudo update-alternatives --install /usr/bin/clang-format clang-format /usr/bin/clang-format-18 42
 
       - name: Build
         run: |
@@ -96,7 +95,7 @@ jobs:
             -DCHATTERINO_PLUGINS="$C2_PLUGINS" \
             -DCMAKE_PREFIX_PATH="$Qt6_DIR/lib/cmake" \
             -DCHATTERINO_STATIC_QT_BUILD=On \
-            -DFORCE_JSON_GENERATION=${{matrix.os == 'ubuntu-20.04' && 'Off' || 'On'}} \
+            -DFORCE_JSON_GENERATION=${{matrix.os == 'ubuntu-24.04' && 'On' || 'Off'}} \
             ..
           make -j"$(nproc)"