Fix ci

Author: ranfdev

.github/workflows/build-flatpak.yml

@@ -6,10 +6,7 @@ jobs:
   tests:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/[email protected]
-    - uses: cachix/install-nix-action@v15
-      with:
-        extra_nix_config: |
-          access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
-    - run: nix run .#build-flatpak build-flatpak build-aux/com.ranfdev.Geopard.Devel.json
+    - uses: actions/checkout@master
+    - run: sudo apt install flatpak-builder flatpak jq
+    - run: bash ./build-aux/build-flatpak.sh build ./build-aux/com.ranfdev.Geopard.json
 

build-aux/build-flatpak.sh

@@ -0,0 +1,47 @@
+#!/usr/bin/env bash
+set -e
+
+# Read data from manifest
+folder=$1
+manifest=$2;
+name=$(< "$manifest" jq -r '.["modules"] | last | .["name"]');
+appid=$(< "$manifest" jq -r '.["app-id"]');
+runtime=$(< "$manifest" jq -r '"runtime/" + .["runtime"] + "/x86_64/" + .["runtime-version"]');
+sdk=$(< "$manifest" jq -r '.["sdk"] + "/x86_64/" + .["runtime-version"]');
+sdk_extensions=$(< "$manifest" jq -r '.["sdk-extensions"] | .[]');
+
+# Install flathub repo
+flatpak --verbose remote-add --user --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo;
+flatpak install --user -y "$runtime";
+flatpak install --user -y "$sdk";
+for ext in $sdk_extensions
+do
+  echo "$ext";
+  flatpak install --user -y "$ext";
+done
+
+
+# Prepare build folder
+if [ -n "$(ls -A "$folder")" ]; then
+  echo error: directory "$folder" is not empty;
+  exit 1;
+fi
+rm -rf "$folder";
+mkdir "$folder";
+
+# Generate dist archive and the release manifest
+flatpak-builder --user "$folder"/build "$manifest" --build-only --stop-at="$name" --keep-build-dirs --force-clean;
+echo "meson dist --include-subprojects --no-tests" | flatpak-builder --user "$folder"/build "$manifest" --build-shell="$name" --keep-build-dirs --state-dir="$folder"/state;
+< "$manifest" jq '(.["modules"] | last | .["sources"] | last) |= {type: "archive", path: "archive.tar.xz"}' > build-flatpak-auto/manifest-archive.json;
+
+# Build the app from the dist archive, using the corrected manifest
+cd "$folder"/;
+mv state/build/"$name"/_flatpak_build/meson-dist/*.tar.xz archive.tar.xz;
+flatpak-builder --user build --repo repo manifest-archive.json --force-clean;
+flatpak build-bundle ./repo "$appid".flatpak "$appid"
+
+# Put all the artifacts in a single folder
+mkdir artifacts;
+mv "$appid".flatpak artifacts/;
+mv manifest-archive.json artifacts/"$appid".json;
+mv archive.tar.xz artifacts/"$appid".tar.xz;

build-aux/com.ranfdev.Geopard.json

@@ -4,7 +4,7 @@
     "runtime-version" : "42",
     "sdk" : "org.gnome.Sdk",
     "sdk-extensions" : [
-        "org.freedesktop.Sdk.Extension.rust-stable"
+        "org.freedesktop.Sdk.Extension.rust-stable//21.08"
     ],
     "command" : "geopard",
     "tags" : [

flake.lock

@@ -1,50 +1,6 @@
-{flatpak-builder, flatpak, stdenv, jq, writeShellApplication, writeTextFile}: 
-let 
-f = writeTextFile {
-    name = "build-terminal.sh";
-    text = ''
-    meson dist --include-subprojects --no-tests;
-    '';
-};
-in
+{flatpak-builder, flatpak, stdenv, jq, writeShellApplication}: 
 writeShellApplication {
   name = "build-flatpak";
   runtimeInputs = [flatpak-builder flatpak jq];
-  text = ''
-    # Read data from manifest
-    folder=$1
-    manifest=$2;
-    name=$(< "$manifest" jq -r '.["modules"] | last | .["name"]');
-    appid=$(< "$manifest" jq -r '.["app-id"]');
-    runtime=$(< "$manifest" jq -r '"runtime/" + .["runtime"] + "/x86_64/" + .["runtime-version"]');
-
-    # Install flathub repo
-    flatpak --verbose remote-add --system --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo;
-    flatpak install --system -y "$runtime";
-
-    # Prepare build folder
-    if [ -n "$(ls -A "$folder")" ]; then
-      echo error: directory "$folder" is not empty;
-      exit 1;
-    fi
-    rm -rf "$folder";
-    mkdir "$folder";
-
-    # Generate dist archive and the release manifest
-    flatpak-builder "$folder"/build "$manifest" --build-only --stop-at="$name" --keep-build-dirs --force-clean;
-    < ${f} flatpak-builder "$folder"/build "$manifest" --build-shell="$name" --keep-build-dirs --state-dir="$folder"/state;
-    < "$manifest" jq '(.["modules"] | last | .["sources"] | last) |= {type: "archive", path: "archive.tar.xz"}' > build-flatpak-auto/manifest-archive.json;
-
-    # Build the app from the dist archive, using the corrected manifest
-    cd "$folder"/;
-    mv state/build/"$name"/_flatpak_build/meson-dist/*.tar.xz archive.tar.xz;
-    flatpak-builder build --repo repo manifest-archive.json --force-clean;
-    flatpak build-bundle ./repo "$appid".flatpak "$appid"
-    
-    # Put all the artifacts in a single folder
-    mkdir artifacts;
-    mv "$appid".flatpak artifacts/;
-    mv manifest-archive.json artifacts/"$appid".json;
-    mv archive.tar.xz artifacts/"$appid".tar.xz;
-  '';
+  text = builtins.readFile ../build-aux/build-flatpak.sh;
 }