From d37d9b7168f2a1fa051610603051d54729d828c8 Mon Sep 17 00:00:00 2001
From: fgsfds <derp.primus@gmail.com>
Date: Tue, 12 Nov 2024 22:50:36 +0100
Subject: [PATCH] ci: move flatpak back to i686 for now

---
 .github/workflows/c-cpp.yml                      | 2 +-
 dist/linux/io.github.fgsfdsfgs.perfect_dark.sh   | 8 ++++----
 dist/linux/io.github.fgsfdsfgs.perfect_dark.yaml | 8 +++-----
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
index 888eb3626..c4a7aa1a1 100644
--- a/.github/workflows/c-cpp.yml
+++ b/.github/workflows/c-cpp.yml
@@ -162,7 +162,7 @@ jobs:
     - uses: actions/checkout@v4
     - uses: actions/download-artifact@v4
       with:
-        name: pd-x86_64-linux
+        name: pd-i686-linux
         path: dist/linux/bin/
 
     - uses: flatpak/flatpak-github-actions/flatpak-builder@v6
diff --git a/dist/linux/io.github.fgsfdsfgs.perfect_dark.sh b/dist/linux/io.github.fgsfdsfgs.perfect_dark.sh
index 28ff8213b..9269fbd70 100644
--- a/dist/linux/io.github.fgsfdsfgs.perfect_dark.sh
+++ b/dist/linux/io.github.fgsfdsfgs.perfect_dark.sh
@@ -11,14 +11,14 @@ done
 # Default to pd as executable but switch to jpn/pal if the NTSC rom
 # is missing but JPN/PAL are present.
 # TODO: Other arch
-executable="pd.x86_64"
+executable="pd.i686"
 if [ -f ${XDG_DATA_HOME}/roms/pd.ntsc-final.z64 ] | \
    [ -f ${XDG_DATA_HOME}/roms/pd.ntsc-1.0.z64 ]; then
-    executable="pd.x86_64"
+    executable="pd.i686"
 elif [ -f ${XDG_DATA_HOME}/roms/pd.jpn-final.z64 ]; then
-    executable="pd.jpn.x86_64"
+    executable="pd.jpn.i686"
 elif [ -f ${XDG_DATA_HOME}/roms/pd.pal-final.z64 ]; then
-    executable="pd.pal.x86_64"
+    executable="pd.pal.i686"
 fi
 
 # If first parameter passed to this script is one of the pd executables,
diff --git a/dist/linux/io.github.fgsfdsfgs.perfect_dark.yaml b/dist/linux/io.github.fgsfdsfgs.perfect_dark.yaml
index 7ef407946..c9d1d4f1d 100644
--- a/dist/linux/io.github.fgsfdsfgs.perfect_dark.yaml
+++ b/dist/linux/io.github.fgsfdsfgs.perfect_dark.yaml
@@ -5,8 +5,6 @@ sdk: org.freedesktop.Sdk
 command: io.github.fgsfdsfgs.perfect_dark.sh
 
 finish-args:
-  # multiarch is required for 32bit binaries
-  - --allow=multiarch
   # hardware 3D and controller access
   - --device=all
   # X11 + XShm access
@@ -65,11 +63,11 @@ modules:
     buildsystem: simple
     sources:
       - type: file
-        path: bin/pd
+        path: bin/pd.i686
       - type: file
-        path: bin/pd.jpn
+        path: bin/pd.jpn.i686
       - type: file
-        path: bin/pd.pal
+        path: bin/pd.pal.i686
       - type: file
         path: io.github.fgsfdsfgs.perfect_dark.sh
       - type: file