From 02fe1c023a37322b1197b38cec4a21572a719ed1 Mon Sep 17 00:00:00 2001
From: dav <usr21p1@gmail.com>
Date: Sat, 13 Jul 2024 10:34:55 -0700
Subject: [PATCH] Test build multiarch

---
 .github/workflows/build-appimage.yml   |  9 +++------
 burrow-gtk/build-aux/build_appimage.sh | 15 +++++++++++----
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/build-appimage.yml b/.github/workflows/build-appimage.yml
index ff71251..4ac3a6f 100644
--- a/.github/workflows/build-appimage.yml
+++ b/.github/workflows/build-appimage.yml
@@ -16,17 +16,14 @@ jobs:
       matrix:
         include:
         - os: ubuntu-latest
-          platform: Linux
-          arch:
-            - x86_64
+          arch: x86_64
         - os: ubuntu-latest
-          arch:
-            - aarch64
+          arch: aarch64
     steps:
     - uses: actions/checkout@v4
     - name: Build AppImage
       run: |
-        docker build -t appimage-builder --build-arg="ARCHITECTURE=${{ matrix.arch }}" . -f burrow-gtk/build-aux/Dockerfile
+        docker build -t appimage-builder --build-arg="TARGET_ARCHITECTURE=${{ matrix.arch }}" . -f burrow-gtk/build-aux/Dockerfile
         docker create --name temp appimage-builder
         docker cp temp:/app/burrow-gtk/build-appimage/Burrow-x86_64.AppImage .
         docker rm temp
diff --git a/burrow-gtk/build-aux/build_appimage.sh b/burrow-gtk/build-aux/build_appimage.sh
index f054cd9..6635b79 100755
--- a/burrow-gtk/build-aux/build_appimage.sh
+++ b/burrow-gtk/build-aux/build_appimage.sh
@@ -6,27 +6,34 @@ BURROW_GTK_ROOT="$(readlink -f $(dirname -- "$(readlink -f -- "$BASH_SOURCE")")/
 BURROW_GTK_BUILD="$BURROW_GTK_ROOT/build-appimage"
 LINUXDEPLOY_VERSION="${LINUXDEPLOY_VERSION:-"1-alpha-20240109-1"}"
 BURROW_BUILD_TYPE="${BURROW_BUILD_TYPE:-"release"}"
+CARGO_FLAGS=""
 
 if [ "$BURROW_GTK_ROOT" != $(pwd) ]; then
     echo "Make sure to cd into burrow-gtk"
     exit 1
 fi
 
-ARCHITECTURE=$(lscpu | grep Architecture | awk '{print $2}')
+HOST_ARCHITECTURE=$(lscpu | grep Architecture | awk '{print $2}')
+TARGET_ARCHITECTURE=""
 
-if [ "$ARCHITECTURE" == "x86_64" ]; then
+if [ "$HOST_ARCHITECTURE" == "x86_64" ]; then
     wget "https://github.com/linuxdeploy/linuxdeploy/releases/download/$LINUXDEPLOY_VERSION/linuxdeploy-x86_64.AppImage" -o /dev/null -O /tmp/linuxdeploy
     chmod a+x /tmp/linuxdeploy
-elif [ "$ARCHITECTURE" == "aarch64" ]; then
+elif [ "$HOST_ARCHITECTURE" == "aarch64" ]; then
     wget "https://github.com/linuxdeploy/linuxdeploy/releases/download/$LINUXDEPLOY_VERSION/linuxdeploy-aarch64.AppImage" -o /dev/null -O /tmp/linuxdeploy
     chmod a+x /tmp/linuxdeploy
 fi
 
+if [ "$TARGET_ARCHITECTURE" == "x86_64" ]; then
+    CARGO_FLAGS="--target x86_64-unknown-linux-gnu"
+elif [ "$TARGET_ARCHITECTURE" == "aarch64" ]; then
+    CARGO_FLAGS="--target aarch64-unknown-linux-gnu"
+fi
 
 CFLAGS="-I/usr/local/include -I/usr/include/$MUSL_TARGET -fPIE"
 meson setup $BURROW_GTK_BUILD --bindir bin --prefix /usr --buildtype $BURROW_BUILD_TYPE
 meson compile -C $BURROW_GTK_BUILD
 DESTDIR=AppDir meson install -C $BURROW_GTK_BUILD
-cargo b --$BURROW_BUILD_TYPE --manifest-path=../Cargo.toml
+CARGO_FLAGS=$CARGO_FLAGS cargo b --$BURROW_BUILD_TYPE --manifest-path=../Cargo.toml
 /tmp/linuxdeploy --appimage-extract-and-run --appdir $BURROW_GTK_BUILD/AppDir -e $BURROW_GTK_BUILD/../../target/$BURROW_BUILD_TYPE/burrow --output appimage
 mv *.AppImage $BURROW_GTK_BUILD