Fix installation of 32-bit deps

.github/workflows/main.yml

@@ -11,7 +11,7 @@ on:
 jobs:
   appimage-x86_64:
     name: AppImage x86_64
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-16.04
     env:
       ARCH: x86_64
     steps:
@@ -28,7 +28,7 @@ jobs:
 
   appimage-i386:
     name: AppImage i386
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-16.04
     env:
       ARCH: i386
     steps:
@@ -48,42 +48,11 @@ jobs:
           name: AppImage i386
           path: linuxdeploy-plugin-appimage*.AppImage*
 
-  appimage-aarch64:
-    name: AppImage aarch64
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2.1.0
-        with:
-          submodules: recursive
-      - name: Build AppImage
-        uses: uraimo/run-on-arch-action@v2.0.5
-        with:
-          arch: aarch64
-          distro: ubuntu18.04
-          githubToken: ${{ github.token }}
-          dockerRunArgs: |
-            --volume "${PWD}:/build"
-          install: |
-            apt update
-            apt install -y build-essential wget
-            wget -q -O cmake-install.sh https://github.com/Kitware/CMake/releases/download/v3.22.5/cmake-3.22.5-Linux-$(uname -m).sh
-            sh cmake-install.sh --prefix=/usr --skip-license --exclude-subdir
-            rm cmake-install.sh
-          run: |
-            cd /build
-            ARCH=$(uname -m) ci/build-appimage.sh
-      - name: Archive artifacts
-        uses: actions/upload-artifact@v2
-        with:
-          name: AppImage aarch64
-          path: linuxdeploy-plugin-appimage*.AppImage*
-
   upload:
     name: Create release and upload artifacts
     needs:
       - appimage-x86_64
       - appimage-i386
-      - appimage-aarch64
     runs-on: ubuntu-latest
     steps:
       - name: Download artifacts

README.md

@@ -15,6 +15,7 @@ When calling linuxdeploy, just add `--output appimage` to enable the plugin. Aft
 *For more information, see the [official AppImage packaging guide](https://docs.appimage.org/packaging-guide/native-binaries.html).*
 
 
+
 ### Standalone usage
 
 Like all linuxdeploy plugins, linuxdeploy-plugin-appimage is a standalone tool and can be used without linuxdeploy.
@@ -28,7 +29,6 @@ The official linuxdeploy AppImage ships with a fairly recent version of the plug
 
 *For more information on how linuxdeploy's plugin system works, please refer to [the documentation](https://docs.appimage.org/packaging-guide/linuxdeploy-user-guide.html#plugin-system).*
 
-
 ### Optional variables
 
 linuxdeploy-plugin-appimage can be configured using environment variables.
@@ -38,4 +38,3 @@ linuxdeploy-plugin-appimage can be configured using environment variables.
 - `SIGN_KEY=key_id`: GPG Key ID to use for signing. This environment variable is only used if `SIGN` is set.
 - `VERBOSE=1`: set this variable to any value to enable verbose output
 - `OUTPUT=filename`: change filename of resulting AppImage
-- `NO_APPSTREAM=1`: skip checking AppStream metadata for issues

ci/build-appimage.sh

@@ -30,10 +30,6 @@ if [ "$ARCH" == "x86_64" ]; then
     EXTRA_CMAKE_ARGS=()
 elif [ "$ARCH" == "i386" ]; then
     EXTRA_CMAKE_ARGS=("-DCMAKE_TOOLCHAIN_FILE=$REPO_ROOT/cmake/toolchains/i386-linux-gnu.cmake")
-elif [ "$ARCH" == "armhf" ]; then
-    EXTRA_CMAKE_ARGS=()
-elif [ "$ARCH" == "aarch64" ]; then
-    EXTRA_CMAKE_ARGS=()
 else
     echo "Architecture not supported: $ARCH" 1>&2
     exit 1
@@ -48,7 +44,7 @@ make install DESTDIR=AppDir
 AIK_ARCH="$ARCH"
 [ "$ARCH" == "i386" ] && AIK_ARCH="i686"
 
-wget https://github.com/encounter/linuxdeploy/releases/download/continuous/linuxdeploy-"$ARCH".AppImage
+wget https://github.com/TheAssassin/linuxdeploy/releases/download/continuous/linuxdeploy-"$ARCH".AppImage
 chmod +x linuxdeploy-"$ARCH".AppImage
 
 # bundle appimagetool

src/main.cpp

@@ -129,10 +129,6 @@ int main(const int argc, const char* const* const argv) {
         args.push_back(strdup(getenv("OUTPUT")));
     }
 
-    if (getenv("NO_APPSTREAM") != nullptr) {
-        args.push_back(strdup("--no-appstream"));
-    }
-
     args.push_back(nullptr);
 
     std::cerr << "Running command: " << pathToAppimagetool;