From d2612bed3acc5618e8c9578ef0fa424ff32eb8c2 Mon Sep 17 00:00:00 2001 From: Zion Nimchuk Date: Fri, 11 Oct 2024 18:50:47 -0700 Subject: [PATCH] Switch to focal for aarch64, update Qt --- .ci/build-linux-aarch64.sh | 6 +++--- .cirrus.yml | 2 +- azure-pipelines.yml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.ci/build-linux-aarch64.sh b/.ci/build-linux-aarch64.sh index b18f307606..4dca82ffb9 100644 --- a/.ci/build-linux-aarch64.sh +++ b/.ci/build-linux-aarch64.sh @@ -12,8 +12,8 @@ git submodule -q update --init $(awk '/path/ && !/llvm/ { print $3 }' .gitmodule mkdir build && cd build || exit 1 -export CC=clang -export CXX=clang++ +export CC="${CLANG_BINARY}" +export CXX="${CLANGXX_BINARY}" cmake .. \ -DCMAKE_INSTALL_PREFIX=/usr \ @@ -27,8 +27,8 @@ cmake .. \ -DUSE_SYSTEM_FFMPEG=OFF \ -DUSE_DISCORD_RPC=ON \ -DOpenGL_GL_PREFERENCE=LEGACY \ + -DLLVM_DIR=/opt/llvm/lib/cmake/llvm \ -DSTATIC_LINK_LLVM=ON \ - -DBUILD_LLVM=OFF \ -G Ninja ninja; build_status=$?; diff --git a/.cirrus.yml b/.cirrus.yml index 209d7179d9..4dce31a4e9 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -132,7 +132,7 @@ linux_aarch64_task: matrix: - name: Cirrus Linux AArch64 Clang arm_container: - image: 'docker.io/kd117/rpcs3-ci-aarch64:latest' + image: 'docker.io/rpcs3/rpcs3-ci-focal-aarch64:1.0' cpu: 8 memory: 8G clang_script: diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 9b4ac02402..8c6c8f36b5 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -38,13 +38,13 @@ jobs: displayName: ccache - bash: | - docker pull --quiet rpcs3/rpcs3-ci-focal:1.7.1 + docker pull --quiet rpcs3/rpcs3-ci-focal:1.9 docker run \ -v $(pwd):/rpcs3 \ --env-file .ci/docker.env \ -v $CCACHE_DIR:/root/.ccache \ -v $BUILD_ARTIFACTSTAGINGDIRECTORY:/root/artifacts \ - rpcs3/rpcs3-ci-focal:1.7.1 \ + rpcs3/rpcs3-ci-focal:1.9 \ /rpcs3/.ci/build-linux.sh displayName: Docker setup and build