infra: Fix AppImage build for arm64

ryujinx-mirror · Oct 6, 2024 · dc545c3 · dc545c3
1 parent 51b956a
commit dc545c3
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 10 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -82,7 +82,7 @@ jobs:
       - name: Build AppImage
         if: github.event_name == 'pull_request' && matrix.platform.os == 'ubuntu-latest'
         run: |
-          ARCH_NAME="${RUNNER_ARCH,,}"
+          PLATFORM_NAME="${{ matrix.platform.name }}"
 
           sudo apt install -y zsync desktop-file-utils appstream
 
@@ -93,13 +93,15 @@ jobs:
           wget -q -O tools/appimagetool "https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-x86_64.AppImage"
           chmod +x tools/appimagetool
 
-          # Explicitly set $ARCH for appimagetool
-          if [ "$ARCH_NAME" = "x64" ]; then
+          # Explicitly set $ARCH for appimagetool ($ARCH_NAME is for the file name)
+          if [ "$PLATFORM_NAME" = "linux-x64" ]; then
+            ARCH_NAME=x64
             export ARCH=x86_64
-          elif [ "$ARCH_NAME" = "arm64" ]; then
+          elif [ "$PLATFORM_NAME" = "linux-arm64" ]; then
+            ARCH_NAME=arm64
             export ARCH=aarch64
           else
-            echo "Unexpected ARCH_NAME "$ARCH_NAME""
+            echo "Unexpected PLATFORM_NAME "$PLATFORM_NAME""
             exit 1
           fi
 

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -124,7 +124,7 @@ jobs:
         if: matrix.platform.os == 'ubuntu-latest'
         run: |
           BUILD_VERSION="${{ steps.version_info.outputs.build_version }}"
-          ARCH_NAME="${RUNNER_ARCH,,}"
+          PLATFORM_NAME="${{ matrix.platform.name }}"
 
           sudo apt install -y zsync desktop-file-utils appstream
 
@@ -135,13 +135,15 @@ jobs:
           wget -q -O tools/appimagetool "https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-x86_64.AppImage"
           chmod +x tools/appimagetool
 
-          # Explicitly set $ARCH for appimagetool
-          if [ "$ARCH_NAME" = "x64" ]; then
+          # Explicitly set $ARCH for appimagetool ($ARCH_NAME is for the file name)
+          if [ "$PLATFORM_NAME" = "linux-x64" ]; then
+            ARCH_NAME=x64
             export ARCH=x86_64
-          elif [ "$ARCH_NAME" = "arm64" ]; then
+          elif [ "$PLATFORM_NAME" = "linux-arm64" ]; then
+            ARCH_NAME=arm64
             export ARCH=aarch64
           else
-            echo "Unexpected ARCH_NAME "$ARCH_NAME""
+            echo "Unexpected PLATFORM_NAME "$PLATFORM_NAME""
             exit 1
           fi