From cd4d829f9f22a8c2ddfbc360413e170a852bbaa1 Mon Sep 17 00:00:00 2001 From: Stenzek Date: Sat, 24 Jun 2023 01:37:39 +1000 Subject: [PATCH] CI/Linux: Use clang 16 for AppImage --- .github/workflows/linux_build_qt.yml | 4 ++-- .github/workflows/scripts/linux/install-packages-qt.sh | 8 +++++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/workflows/linux_build_qt.yml b/.github/workflows/linux_build_qt.yml index d65d8afc51..f39dca3363 100644 --- a/.github/workflows/linux_build_qt.yml +++ b/.github/workflows/linux_build_qt.yml @@ -102,8 +102,8 @@ jobs: env: COMPILER: ${{ inputs.compiler }} ADDITIONAL_CMAKE_ARGS: ${{ inputs.cmakeflags }} - CLANG_PATH: /usr/bin/clang-12 - CLANGXX_PATH: /usr/bin/clang++-12 + CLANG_PATH: /usr/bin/clang-16 + CLANGXX_PATH: /usr/bin/clang++-16 run: | DEPS_PREFIX="$HOME/deps" .github/workflows/scripts/linux/generate-cmake-qt.sh diff --git a/.github/workflows/scripts/linux/install-packages-qt.sh b/.github/workflows/scripts/linux/install-packages-qt.sh index 43d7f210ad..7ad9ada9ee 100755 --- a/.github/workflows/scripts/linux/install-packages-qt.sh +++ b/.github/workflows/scripts/linux/install-packages-qt.sh @@ -67,7 +67,13 @@ declare -a PCSX2_PACKAGES=( if [ "${COMPILER}" = "gcc" ]; then BUILD_PACKAGES+=("g++-10") else - BUILD_PACKAGES+=("llvm-12" "lld-12" "clang-12") + BUILD_PACKAGES+=("llvm-16" "lld-16" "clang-16") + + # Ubuntu 20.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 - + sudo apt-add-repository -n 'deb http://apt.llvm.org/focal/ llvm-toolchain-focal-16 main' + retry_command sudo apt-get update + retry_command sudo apt-get install clang-16 lld-16 fi retry_command sudo apt-get -qq update && break