From f198291de0c5467aef963ec7ae7899f524df0bd8 Mon Sep 17 00:00:00 2001
From: Aleksey Komarov <q4arus@ya.ru>
Date: Sun, 19 Jan 2025 12:59:37 +0300
Subject: [PATCH] Add arm64 build, update Qt version and docker image for
 github actions

---
 .ci/build-linux-aarch64.sh  | 12 ++++++++++--
 .github/workflows/rpcs3.yml | 24 ++++++++++++++++--------
 2 files changed, 26 insertions(+), 10 deletions(-)
 mode change 100644 => 100755 .ci/build-linux-aarch64.sh

diff --git a/.ci/build-linux-aarch64.sh b/.ci/build-linux-aarch64.sh
old mode 100644
new mode 100755
index a0c4724bff89..38829ea130ba
--- a/.ci/build-linux-aarch64.sh
+++ b/.ci/build-linux-aarch64.sh
@@ -12,8 +12,16 @@ git submodule -q update --init $(awk '/path/ && !/llvm/ && !/opencv/ { print $3
 
 mkdir build && cd build || exit 1
 
-export CC="${CLANG_BINARY}"
-export CXX="${CLANGXX_BINARY}"
+if [ "$COMPILER" = "gcc" ]; then
+    # These are set in the dockerfile
+    export CC="${GCC_BINARY}"
+    export CXX="${GXX_BINARY}"
+    export LINKER=gold
+    export CFLAGS="-fuse-linker-plugin -fuse-ld=${LINKER}"
+else
+    export CC="${CLANG_BINARY}"
+    export CXX="${CLANGXX_BINARY}"
+fi
 
 cmake ..                                               \
     -DCMAKE_INSTALL_PREFIX=/usr                        \
diff --git a/.github/workflows/rpcs3.yml b/.github/workflows/rpcs3.yml
index ad73ef629df9..a249c0b1e93a 100644
--- a/.github/workflows/rpcs3.yml
+++ b/.github/workflows/rpcs3.yml
@@ -23,10 +23,18 @@ env:
 
 jobs:
   Linux_Build:
-    runs-on: ubuntu-latest
     strategy:
+      fail-fast: false
       matrix:
         compiler: [clang, gcc]
+        cfg:
+          - os: ubuntu-24.04-arm
+            docker_img: "rpcs3/rpcs3-ci-focal-aarch64:1.0"
+            build_sh: "/rpcs3/.ci/build-linux-aarch64.sh"
+          - os: ubuntu-24.04
+            docker_img: "rpcs3/rpcs3-ci-focal:1.9"
+            build_sh: "/rpcs3/.ci/build-linux.sh"
+    runs-on: ${{ matrix.cfg.os }}
     env:
       CCACHE_DIR: ${{ github.workspace }}/ccache
       CI_HAS_ARTIFACTS: true
@@ -56,19 +64,19 @@ jobs:
 
       - name: Docker setup and build
         run: |
-          docker pull --quiet rpcs3/rpcs3-ci-focal:1.7
+          docker pull --quiet ${{ matrix.cfg.docker_img }}
           docker run                      \
             -v $PWD:/rpcs3              \
             --env-file .ci/docker.env \
             -v ${{ env.CCACHE_DIR }}:/root/.ccache  \
             -v ${{ github.workspace }}/artifacts:/root/artifacts \
-            rpcs3/rpcs3-ci-focal:1.7 \
-            /rpcs3/.ci/build-linux.sh
+            ${{ matrix.cfg.docker_img }} \
+            ${{ matrix.cfg.build_sh }}
 
       - name: Upload artifacts
         uses: actions/upload-artifact@main
         with:
-          name: RPCS3 for Linux (${{ matrix.compiler }})
+          name: RPCS3 for Linux (${{ runner.arch }}, ${{ matrix.compiler }})
           path: ${{ github.workspace }}/build/*.AppImage
           compression-level: 0
 
@@ -77,9 +85,9 @@ jobs:
     env:
       COMPILER: msvc
       QT_VER_MAIN: '6'
-      QT_VER: '6.6.3'
-      QT_VER_MSVC: 'msvc2019'
-      QT_DATE: '202403191840'
+      QT_VER: '6.8.1'
+      QT_VER_MSVC: 'msvc2022'
+      QT_DATE: '202411221531'
       VULKAN_VER: '1.3.268.0'
       VULKAN_SDK_SHA: '8459ef49bd06b697115ddd3d97c9aec729e849cd775f5be70897718a9b3b9db5'
       CACHE_DIR: ./cache