From cdce0f7a371969a95a1a984360f23a6288c7b39f Mon Sep 17 00:00:00 2001 From: Stenzek Date: Sat, 20 Jun 2026 12:41:06 +1000 Subject: [PATCH] CI: Bump to LLVM 22 Windows builders have it now. --- .github/workflows/linux-appimage-build.yml | 4 ++-- .github/workflows/linux-cross-appimage-build.yml | 16 ++++++++-------- scripts/appimage/install-packages.sh | 6 +++--- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/linux-appimage-build.yml b/.github/workflows/linux-appimage-build.yml index 0e861f52d..5b0b8173f 100644 --- a/.github/workflows/linux-appimage-build.yml +++ b/.github/workflows/linux-appimage-build.yml @@ -64,7 +64,7 @@ jobs: run: | mkdir build cd build - cmake -G Ninja -DCMAKE_BUILD_TYPE=Release ${{ matrix.cmakeoptions }} -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_C_COMPILER=clang-20 -DCMAKE_CXX_COMPILER=clang++-20 -DCMAKE_EXE_LINKER_FLAGS_INIT="-fuse-ld=lld" -DCMAKE_MODULE_LINKER_FLAGS_INIT="-fuse-ld=lld" -DCMAKE_SHARED_LINKER_FLAGS_INIT="-fuse-ld=lld" .. + cmake -G Ninja -DCMAKE_BUILD_TYPE=Release ${{ matrix.cmakeoptions }} -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_C_COMPILER=clang-22 -DCMAKE_CXX_COMPILER=clang++-22 -DCMAKE_EXE_LINKER_FLAGS_INIT="-fuse-ld=lld" -DCMAKE_MODULE_LINKER_FLAGS_INIT="-fuse-ld=lld" -DCMAKE_SHARED_LINKER_FLAGS_INIT="-fuse-ld=lld" .. cmake --build . --parallel cd .. scripts/appimage/make-appimage.sh $(realpath .) $(realpath ./build) "${{ matrix.asset }}" @@ -74,4 +74,4 @@ jobs: with: path: "${{ matrix.asset }}" archive: false - if-no-files-found: error \ No newline at end of file + if-no-files-found: error diff --git a/.github/workflows/linux-cross-appimage-build.yml b/.github/workflows/linux-cross-appimage-build.yml index fea049f63..6337f3c6b 100644 --- a/.github/workflows/linux-cross-appimage-build.yml +++ b/.github/workflows/linux-cross-appimage-build.yml @@ -50,7 +50,7 @@ jobs: - name: Create Binary Aliases run: | - ln -s llvm-strip-20 /usr/bin/llvm-strip + ln -s llvm-strip-22 /usr/bin/llvm-strip - name: Set Up Toolchain File run: | @@ -58,12 +58,12 @@ jobs: echo "set(CMAKE_FIND_ROOT_PATH \"$PWD/dep/prebuilt/linux-cross-${{matrix.arch}};/${{matrix.arch}}-chroot\")" >> "$HOME/toolchain.cmake" echo "set(QT_HOST_PATH \"$PWD/dep/prebuilt/linux-x64\")" >> "$HOME/toolchain.cmake" echo "set(LCONVERT_EXE \"$PWD/dep/prebuilt/linux-x64/bin/lconvert\")" >> "$HOME/toolchain.cmake" - echo "set(CMAKE_C_COMPILER clang-20)" >> "$HOME/toolchain.cmake" - echo "set(CMAKE_C_COMPILER_AR llvm-ar-20)" >> "$HOME/toolchain.cmake" - echo "set(CMAKE_C_COMPILER_RANLIB llvm-ranlib-20)" >> "$HOME/toolchain.cmake" - echo "set(CMAKE_CXX_COMPILER clang++-20)" >> "$HOME/toolchain.cmake" - echo "set(CMAKE_CXX_COMPILER_AR llvm-ar-20)" >> "$HOME/toolchain.cmake" - echo "set(CMAKE_CXX_COMPILER_RANLIB llvm-ranlib-20)" >> "$HOME/toolchain.cmake" + echo "set(CMAKE_C_COMPILER clang-22)" >> "$HOME/toolchain.cmake" + echo "set(CMAKE_C_COMPILER_AR llvm-ar-22)" >> "$HOME/toolchain.cmake" + echo "set(CMAKE_C_COMPILER_RANLIB llvm-ranlib-22)" >> "$HOME/toolchain.cmake" + echo "set(CMAKE_CXX_COMPILER clang++-22)" >> "$HOME/toolchain.cmake" + echo "set(CMAKE_CXX_COMPILER_AR llvm-ar-22)" >> "$HOME/toolchain.cmake" + echo "set(CMAKE_CXX_COMPILER_RANLIB llvm-ranlib-22)" >> "$HOME/toolchain.cmake" echo "set(CMAKE_EXE_LINKER_FLAGS_INIT "-fuse-ld=lld")" >> "$HOME/toolchain.cmake" echo "set(CMAKE_MODULE_LINKER_FLAGS_INIT "-fuse-ld=lld")" >> "$HOME/toolchain.cmake" echo "set(CMAKE_SHARED_LINKER_FLAGS_INIT "-fuse-ld=lld")" >> "$HOME/toolchain.cmake" @@ -98,4 +98,4 @@ jobs: with: path: "DuckStation-${{ matrix.arch }}.AppImage" archive: false - if-no-files-found: error \ No newline at end of file + if-no-files-found: error diff --git a/scripts/appimage/install-packages.sh b/scripts/appimage/install-packages.sh index 925448f33..eda2cd23d 100755 --- a/scripts/appimage/install-packages.sh +++ b/scripts/appimage/install-packages.sh @@ -16,13 +16,13 @@ function retry_command { # Workaround for https://github.com/actions/runner-images/issues/675 retry_command wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add - -retry_command sudo apt-add-repository -n 'deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-20 main' +retry_command sudo apt-add-repository -n 'deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-22 main' retry_command sudo apt-get update retry_command sudo apt-get -y install \ - build-essential clang-20 cmake curl extra-cmake-modules git libasound2-dev libcurl4-openssl-dev libdbus-1-dev libdecor-0-dev libegl-dev libevdev-dev \ + build-essential clang-22 cmake curl extra-cmake-modules git libasound2-dev libcurl4-openssl-dev libdbus-1-dev libdecor-0-dev libegl-dev libevdev-dev \ libfontconfig-dev libfreetype-dev libfuse2 libgtk-3-dev libgudev-1.0-dev libharfbuzz-dev libinput-dev libopengl-dev libpipewire-0.3-dev libpulse-dev \ libssl-dev libudev-dev libva-dev libwayland-dev libx11-dev libx11-xcb-dev libxcb1-dev libxcb-composite0-dev libxcb-cursor-dev libxcb-damage0-dev \ libxcb-glx0-dev libxcb-icccm4-dev libxcb-image0-dev libxcb-keysyms1-dev libxcb-present-dev libxcb-randr0-dev libxcb-render0-dev libxcb-render-util0-dev \ libxcb-shape0-dev libxcb-shm0-dev libxcb-sync-dev libxcb-util-dev libxcb-xfixes0-dev libxcb-xinput-dev libxcb-xkb-dev libxext-dev libxkbcommon-x11-dev \ - libxrandr-dev libxss-dev lld-20 llvm-20 nasm ninja-build patchelf pkg-config zlib1g-dev + libxrandr-dev libxss-dev lld-22 llvm-22 nasm ninja-build patchelf pkg-config zlib1g-dev