Merge branch 'arch_based_ci' into 'master'

CI/build script rewrite

See merge request librewolf-community/browser/linux!7

1 files changed, 11 insertions, 4 deletions

diff --git a/flatpak/build_flatpak.sh b/flatpak/build_flatpak.sh
index 999c710..36eff24 100755
--- a/flatpak/build_flatpak.sh
+++ b/flatpak/build_flatpak.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 printf "\n\n---------------------------------------- FLATPAK BUILD --------------------------------------------\n";
 
 # Aborts the script upon any faliure
@@ -10,7 +10,7 @@ FLATPAK_REPO=$2;
 FLATPAK_BUNDLE=$3;
 _SCRIPT_FOLDER=$(realpath $(dirname $0));
 _FLATHUB_REPO="flathub https://flathub.org/repo/flathub.flatpakrepo";
-_FLATHUB_PACKAGES_TO_INSTALL="org.gnome.Platform/x86_64/3.32 org.gnome.Sdk/x86_64/3.32";
+_FLATHUB_PACKAGES_TO_INSTALL="org.gnome.Platform/${CARCH}/3.32 org.gnome.Sdk/${CARCH}/3.32";
 _EXTRACTED_BINARY_TARBALL_FOLDER=$_SCRIPT_FOLDER/librewolf
 _FLATPAK_JSON_FILE=$_SCRIPT_FOLDER/content/io.gitlab.LibreWolf.json;
 _FLATPAK_BUILD_SOURCE_FOLDER=$_SCRIPT_FOLDER/source;
@@ -18,21 +18,28 @@ _FLATPAK_BUILD_FOLDER=build-dir;
 
 # Install build dependencies
 printf "\nInstalling flatpak build dependencies\n";
+
+# we're using a pre-prepared flatpak-image witch aarch64
+apt update && apt install -y software-properties-common
+add-apt-repository -y ppa:alexlarsson/flatpak
+apt update && apt install -y flatpak-builder
 flatpak remote-add --if-not-exists $_FLATHUB_REPO;
 flatpak install -y flathub $_FLATHUB_PACKAGES_TO_INSTALL;
 
 # Extracts the binary tarball
 printf "\nExtracting librewolf binary tarball\n";
+mkdir -p $_EXTRACTED_BINARY_TARBALL_FOLDER;
 tar -xvf $BINARY_TARBALL -C $_EXTRACTED_BINARY_TARBALL_FOLDER;
 
 # Prepare for flatpak build
 printf "\nPreparing files for flatpak build\n";
-mkdir $_FLATPAK_BUILD_SOURCE_FOLDER && mv $_EXTRACTED_BINARY_TARBALL_FOLDER $_FLATPAK_BUILD_SOURCE_FOLDER/librewolf;
+mkdir -p $_FLATPAK_BUILD_SOURCE_FOLDER;
+mv $_EXTRACTED_BINARY_TARBALL_FOLDER $_FLATPAK_BUILD_SOURCE_FOLDER;
 
 # Build Repo
 printf "\nBuilding flatpak repository\n";
 cp "$_FLATPAK_JSON_FILE" ./;
-flatpak-builder --repo="$FLATPAK_REPO" "$_FLATPAK_BUILD_FOLDER" io.gitlab.LibreWolf.json;
+flatpak-builder --disable-rofiles-fuse --repo="$FLATPAK_REPO" "$_FLATPAK_BUILD_FOLDER" io.gitlab.LibreWolf.json;
 
 # Build bundle
 printf "\nBuilding flatpak bundle\n";