From f6da96077b45671402c228b4fe42969d8fc644cd Mon Sep 17 00:00:00 2001 From: Stenzek Date: Wed, 13 May 2026 12:55:59 +1000 Subject: [PATCH] CI: Bump dependencies to 20260512 Also update the Windows builder to use VS2026, and the Linux builders to use clang-20. --- .github/workflows/linux-appimage-build.yml | 2 +- .github/workflows/linux-cross-appimage-build.yml | 14 +++++++------- .github/workflows/windows-build.yml | 4 ++-- CMakeModules/DuckStationDependencies.cmake | 6 +++--- dep/PREBUILT-SHA256SUMS | 12 ++++++------ dep/PREBUILT-VERSION | 2 +- scripts/appimage/install-packages.sh | 6 +++--- 7 files changed, 23 insertions(+), 23 deletions(-) diff --git a/.github/workflows/linux-appimage-build.yml b/.github/workflows/linux-appimage-build.yml index 7788ec8a2..785b33417 100644 --- a/.github/workflows/linux-appimage-build.yml +++ b/.github/workflows/linux-appimage-build.yml @@ -66,7 +66,7 @@ jobs: run: | mkdir build cd build - cmake -G Ninja -DCMAKE_BUILD_TYPE=Release ${{ matrix.cmakeoptions }} -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -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 -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 --build . --parallel cd .. scripts/appimage/make-appimage.sh $(realpath .) $(realpath ./build) "${{ matrix.asset }}" diff --git a/.github/workflows/linux-cross-appimage-build.yml b/.github/workflows/linux-cross-appimage-build.yml index 6114cf22a..6fd783e02 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-19 /usr/bin/llvm-strip + ln -s llvm-strip-20 /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-19)" >> "$HOME/toolchain.cmake" - echo "set(CMAKE_C_COMPILER_AR llvm-ar-19)" >> "$HOME/toolchain.cmake" - echo "set(CMAKE_C_COMPILER_RANLIB llvm-ranlib-19)" >> "$HOME/toolchain.cmake" - echo "set(CMAKE_CXX_COMPILER clang++-19)" >> "$HOME/toolchain.cmake" - echo "set(CMAKE_CXX_COMPILER_AR llvm-ar-19)" >> "$HOME/toolchain.cmake" - echo "set(CMAKE_CXX_COMPILER_RANLIB llvm-ranlib-19)" >> "$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_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" diff --git a/.github/workflows/windows-build.yml b/.github/workflows/windows-build.yml index 6d1608049..863bf5428 100644 --- a/.github/workflows/windows-build.yml +++ b/.github/workflows/windows-build.yml @@ -10,7 +10,7 @@ permissions: jobs: windows-build: name: "${{ matrix.name }}" - runs-on: windows-2022 + runs-on: windows-2025-vs2026 timeout-minutes: 240 strategy: matrix: @@ -106,7 +106,7 @@ jobs: - name: Compile ${{ matrix.name }} Release Build shell: cmd run: | - call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" ${{ matrix.vcvars }} + call "C:\Program Files\Microsoft Visual Studio\18\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" ${{ matrix.vcvars }} msbuild duckstation.sln -t:Build -p:Platform=${{ matrix.platform }};Configuration=${{ matrix.config }} - name: Create ${{ matrix.name }} Symbols Archive diff --git a/CMakeModules/DuckStationDependencies.cmake b/CMakeModules/DuckStationDependencies.cmake index 09875391f..71d1cb041 100644 --- a/CMakeModules/DuckStationDependencies.cmake +++ b/CMakeModules/DuckStationDependencies.cmake @@ -61,7 +61,7 @@ find_package(zstd 1.5.7 REQUIRED NO_DEFAULT_PATH PATHS "${DEPS_PATH}/lib/cmake/zstd") find_package(WebP 1.6.0 REQUIRED NO_DEFAULT_PATH PATHS "${DEPS_PATH}/share/WebP/cmake") -find_package(PNG 1.6.56 REQUIRED +find_package(PNG 1.6.58 REQUIRED NO_DEFAULT_PATH PATHS "${DEPS_PATH}/lib/cmake/PNG") find_package(libjpeg-turbo 3.1.4.1 REQUIRED NO_DEFAULT_PATH PATHS "${DEPS_PATH}/lib/cmake/libjpeg-turbo") @@ -100,11 +100,11 @@ set(QT_NO_PRIVATE_MODULE_WARNING ON) # Should be prebuilt. if(LINUX) - find_package(Qt6 6.11.0 REQUIRED + find_package(Qt6 6.11.1 REQUIRED NO_DEFAULT_PATH PATHS "${DEPS_PATH}/lib/cmake/Qt6" COMPONENTS Core Gui GuiPrivate Widgets LinguistTools DBus) else() - find_package(Qt6 6.11.0 REQUIRED + find_package(Qt6 6.11.1 REQUIRED NO_DEFAULT_PATH PATHS "${DEPS_PATH}/lib/cmake/Qt6" COMPONENTS Core Gui GuiPrivate Widgets LinguistTools) endif() diff --git a/dep/PREBUILT-SHA256SUMS b/dep/PREBUILT-SHA256SUMS index 300382073..e134676f9 100644 --- a/dep/PREBUILT-SHA256SUMS +++ b/dep/PREBUILT-SHA256SUMS @@ -1,6 +1,6 @@ -989439ebcad3465feb4f3159a72fe108e116295c6708a5687532dd497e18c8c1 *deps-linux-cross-arm64.tar.xz -7d92a724ee12a0008c4473ef3c6cd6dba6e8a4a3f2a5bdb096ea664106608d64 *deps-linux-cross-armhf.tar.xz -8266f12d3c43e0244411908e71cf150f4d57d5e3b0782ce0a9c295905a3efe7b *deps-linux-x64.tar.xz -404819e9e47b3cb7bf2451ee105c3d7de69f52cfb1bf722e56124df8bfe4cf94 *deps-macos-universal.tar.xz -3b61786bf67419f3d152850c91d0ea783f0f397b3538717404f0b36846513a9a *deps-windows-arm64.7z -336d23a97d98354866e01c1cc10ff6f1a3a6de8d7032bc77dce21cd067c48f3f *deps-windows-x64.7z +abf5c5afa46e6b32be3cd07200f6d276b1a3e0a839c55abf13673efd0e4ea0a1 *deps-linux-cross-arm64.tar.xz +709cd358794a6394d40dc2d5920cff002f749d3be1a5fa64981e1476f7ecd9b9 *deps-linux-cross-armhf.tar.xz +fdb04c6ad079918a27434f56584776d6ab34752ce0b8c9e5c15cd4cb528f8d52 *deps-linux-x64.tar.xz +2d1c2bfc49666ffe1a1aca34564813881774c4340c0b030b35181538b9107810 *deps-macos-universal.tar.xz +0c1c42b3eb69de884e2c3a600e98a776b19608ed11a0894ae3ed857874bbe323 *deps-windows-arm64.7z +2cca3cbeab9a500d3509c9e9304fa4a267c0fc6214df8aa2197e6ad1cd6bc66c *deps-windows-x64.7z diff --git a/dep/PREBUILT-VERSION b/dep/PREBUILT-VERSION index cb418867c..245c8b6af 100644 --- a/dep/PREBUILT-VERSION +++ b/dep/PREBUILT-VERSION @@ -1 +1 @@ -release-20260404 +release-20260512 diff --git a/scripts/appimage/install-packages.sh b/scripts/appimage/install-packages.sh index d0e7613e2..925448f33 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-19 main' +retry_command sudo apt-add-repository -n 'deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-20 main' retry_command sudo apt-get update retry_command sudo apt-get -y install \ - 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 \ + 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 \ 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-19 llvm-19 nasm ninja-build patchelf pkg-config zlib1g-dev + libxrandr-dev libxss-dev lld-20 llvm-20 nasm ninja-build patchelf pkg-config zlib1g-dev