diff --git a/.github/linux/appimage.sh b/.github/linux/appimage.sh index e1c23cf..c34b296 100755 --- a/.github/linux/appimage.sh +++ b/.github/linux/appimage.sh @@ -1,4 +1,18 @@ -curl -sSfLO "https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-static-x86_64.AppImage" +# check current arch and map it to either x86_64 or arm_aarch64 + +ARCH=$(uname -m) +if [ "$ARCH" == "x86_64" ]; then + ARCH="x86_64" +elif [ "$ARCH" == "aarch64" ]; then + ARCH="arm_aarch64" +else + echo "Unsupported architecture: $ARCH" + exit 1 +fi + + + +curl -sSfLO "https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-static-$ARCH.AppImage" curl -sSfLO "https://github.com/linuxdeploy/linuxdeploy-plugin-gtk/raw/master/linuxdeploy-plugin-gtk.sh" chmod a+x linuxdeploy* @@ -8,10 +22,10 @@ cp -r assets/ AppDir/usr/bin/ cp icons/512.png AppDir/Zelda64Recompiled.png cp .github/linux/Zelda64Recompiled.desktop AppDir/ -./linuxdeploy-static-x86_64.AppImage --appimage-extract +"./linuxdeploy-static-$ARCH.AppImage" --appimage-extract mv squashfs-root/ deploy -ARCH=x86_64 ./deploy/AppRun --appdir=AppDir/ -d AppDir/Zelda64Recompiled.desktop -i AppDir/Zelda64Recompiled.png -e AppDir/usr/bin/Zelda64Recompiled --plugin gtk +./deploy/AppRun --appdir=AppDir/ -d AppDir/Zelda64Recompiled.desktop -i AppDir/Zelda64Recompiled.png -e AppDir/usr/bin/Zelda64Recompiled --plugin gtk sed -i 's/exec/#exec/g' AppDir/AppRun echo 'cd "$this_dir"/usr/bin/' >> AppDir/AppRun echo './Zelda64Recompiled' >> AppDir/AppRun -ARCH=x86_64 ./deploy/usr/bin/linuxdeploy-plugin-appimage --appdir=AppDir +./deploy/usr/bin/linuxdeploy-plugin-appimage --appdir=AppDir diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml index bd339b0..9677a44 100644 --- a/.github/workflows/validate.yml +++ b/.github/workflows/validate.yml @@ -19,7 +19,7 @@ jobs: - run: echo ✓ build-unix: needs: authorize - runs-on: ubuntu-22.04 + runs-on: [ ubuntu-22.04, blaze/ubuntu-22.04 ] strategy: matrix: type: [ Debug, Release ]