ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CI/AppImage: Bump to Clang/LLVM 17

This commit is contained in:
Stenzek 2023-10-25 14:18:59 +10:00 committed by Connor McLaughlin
parent dcf57093f8
commit f025261ddf
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/linux_build_qt.yml vendored
View File

@ -110,8 +110,8 @@ jobs:
env: env:
COMPILER: ${{ inputs.compiler }} COMPILER: ${{ inputs.compiler }}
ADDITIONAL_CMAKE_ARGS: ${{ inputs.cmakeflags }} ADDITIONAL_CMAKE_ARGS: ${{ inputs.cmakeflags }}
CLANG_PATH: /usr/bin/clang-16 CLANG_PATH: /usr/bin/clang-17
CLANGXX_PATH: /usr/bin/clang++-16 CLANGXX_PATH: /usr/bin/clang++-17
run: | run: |
DEPS_PREFIX="$HOME/deps" .github/workflows/scripts/linux/generate-cmake-qt.sh DEPS_PREFIX="$HOME/deps" .github/workflows/scripts/linux/generate-cmake-qt.sh

4
.github/workflows/scripts/linux/install-packages-qt.sh vendored
View File

@ -65,11 +65,11 @@ declare -a PCSX2_PACKAGES=(
) )
if [ "${COMPILER}" = "clang" ]; then if [ "${COMPILER}" = "clang" ]; then
BUILD_PACKAGES+=("llvm-16" "lld-16" "clang-16") BUILD_PACKAGES+=("llvm-17" "lld-17" "clang-17")
# Ubuntu 22.04 doesn't ship with LLVM 16, so we need to pull it from the llvm.org repos. # Ubuntu 22.04 doesn't ship with LLVM 16, so we need to pull it from the llvm.org repos.
retry_command wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add - retry_command wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
sudo apt-add-repository -n 'deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-16 main' sudo apt-add-repository -n 'deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-17 main'
fi fi
retry_command sudo apt-get -qq update && break retry_command sudo apt-get -qq update && break