Switch to focal for aarch64, update Qt

RPCS3 · Oct 12, 2024 · b836202 · b836202
1 parent fdb03fc
commit b836202
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/.ci/build-linux-aarch64.sh b/.ci/build-linux-aarch64.sh
@@ -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
@@ -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
@@ -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.8
       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.8 \
         /rpcs3/.ci/build-linux.sh
     displayName: Docker setup and build