From af085d7e5a5551b3bfa1323bedd33524b091a035 Mon Sep 17 00:00:00 2001 From: Stenzek Date: Fri, 14 Feb 2025 19:06:18 +1000 Subject: [PATCH] CI: Bump to LLVM/clang 19 --- .github/workflows/linux-appimage-build.yml | 4 ++-- scripts/packaging/appimage/install-packages.sh | 6 +++--- scripts/packaging/flatpak/modules/24-soundtouch.yaml | 6 +++--- .../packaging/flatpak/org.duckstation.DuckStation.yaml | 8 ++++---- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/linux-appimage-build.yml b/.github/workflows/linux-appimage-build.yml index 6e06971739..1f07e10c61 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 -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_PREFIX_PATH="$HOME/deps" -DCMAKE_C_COMPILER=clang-18 -DCMAKE_CXX_COMPILER=clang++-18 -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 -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_PREFIX_PATH="$HOME/deps" -DCMAKE_C_COMPILER=clang-19 -DCMAKE_CXX_COMPILER=clang++-19 -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/packaging/appimage/make-appimage.sh $(realpath .) $(realpath ./build) $HOME/deps DuckStation-x64 @@ -135,7 +135,7 @@ jobs: run: | mkdir build cd build - cmake -G Ninja -DCMAKE_BUILD_TYPE=Release -DDISABLE_SSE4=ON -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_PREFIX_PATH="$HOME/deps" -DCMAKE_C_COMPILER=clang-18 -DCMAKE_CXX_COMPILER=clang++-18 -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 -DDISABLE_SSE4=ON -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_PREFIX_PATH="$HOME/deps" -DCMAKE_C_COMPILER=clang-19 -DCMAKE_CXX_COMPILER=clang++-19 -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/packaging/appimage/make-appimage.sh $(realpath .) $(realpath ./build) $HOME/deps DuckStation-x64-SSE2 diff --git a/scripts/packaging/appimage/install-packages.sh b/scripts/packaging/appimage/install-packages.sh index 4bc77989f7..c9b02633fc 100755 --- a/scripts/packaging/appimage/install-packages.sh +++ b/scripts/packaging/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-18 main' +retry_command sudo apt-add-repository -n 'deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-19 main' retry_command sudo apt-get update retry_command sudo apt-get -y install \ - build-essential clang-18 cmake curl extra-cmake-modules git libasound2-dev libcurl4-openssl-dev libdbus-1-dev libdecor-0-dev libegl-dev libevdev-dev \ + build-essential clang-19 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 lld-18 llvm-18 nasm ninja-build patchelf pkg-config zlib1g-dev + libxrandr-dev lld-19 llvm-19 nasm ninja-build patchelf pkg-config zlib1g-dev diff --git a/scripts/packaging/flatpak/modules/24-soundtouch.yaml b/scripts/packaging/flatpak/modules/24-soundtouch.yaml index f3cebdaf80..9d86dcd1e1 100644 --- a/scripts/packaging/flatpak/modules/24-soundtouch.yaml +++ b/scripts/packaging/flatpak/modules/24-soundtouch.yaml @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +# SPDX-FileCopyrightText: 2019-2025 Connor McLaughlin # SPDX-License-Identifier: CC-BY-NC-ND-4.0 name: soundtouch @@ -9,8 +9,8 @@ config-opts: # Use clang with LTO for speed. - "-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON" - - "-DCMAKE_C_COMPILER=/usr/lib/sdk/llvm18/bin/clang" - - "-DCMAKE_CXX_COMPILER=/usr/lib/sdk/llvm18/bin/clang++" + - "-DCMAKE_C_COMPILER=/usr/lib/sdk/llvm19/bin/clang" + - "-DCMAKE_CXX_COMPILER=/usr/lib/sdk/llvm19/bin/clang++" - "-DCMAKE_EXE_LINKER_FLAGS_INIT=-fuse-ld=lld" - "-DCMAKE_MODULE_LINKER_FLAGS_INIT=-fuse-ld=lld" - "-DCMAKE_SHARED_LINKER_FLAGS_INIT=-fuse-ld=lld" diff --git a/scripts/packaging/flatpak/org.duckstation.DuckStation.yaml b/scripts/packaging/flatpak/org.duckstation.DuckStation.yaml index 487b402bea..9b38e5ce27 100644 --- a/scripts/packaging/flatpak/org.duckstation.DuckStation.yaml +++ b/scripts/packaging/flatpak/org.duckstation.DuckStation.yaml @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2019-2024 Connor McLaughlin +# SPDX-FileCopyrightText: 2019-2025 Connor McLaughlin # SPDX-License-Identifier: CC-BY-NC-ND-4.0 app-id: "org.duckstation.DuckStation" @@ -6,7 +6,7 @@ runtime: "org.kde.Platform" runtime-version: "6.8" sdk: "org.kde.Sdk" sdk-extensions: - - "org.freedesktop.Sdk.Extension.llvm18" + - "org.freedesktop.Sdk.Extension.llvm19" add-extensions: "org.freedesktop.Platform.ffmpeg-full": directory: "lib/ffmpeg" @@ -73,8 +73,8 @@ modules: # Make sure we're using ThinLTO. - "-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON" - - "-DCMAKE_C_COMPILER=/usr/lib/sdk/llvm18/bin/clang" - - "-DCMAKE_CXX_COMPILER=/usr/lib/sdk/llvm18/bin/clang++" + - "-DCMAKE_C_COMPILER=/usr/lib/sdk/llvm19/bin/clang" + - "-DCMAKE_CXX_COMPILER=/usr/lib/sdk/llvm19/bin/clang++" - "-DCMAKE_EXE_LINKER_FLAGS_INIT=-fuse-ld=lld" - "-DCMAKE_MODULE_LINKER_FLAGS_INIT=-fuse-ld=lld" - "-DCMAKE_SHARED_LINKER_FLAGS_INIT=-fuse-ld=lld"