From 43dbe780952edfd6438c88b65a222e7743560fd8 Mon Sep 17 00:00:00 2001
From: Gabriele Musco <gabmus@disroot.org>
Date: Fri, 7 Jul 2023 19:46:59 +0000
Subject: [PATCH] feat: rework gitlab ci around arch; add appimage build

---
 .gitlab-ci.yml                  | 26 +++++++++++++++++++-------
 dist/appimage/build_appimage.sh |  2 ++
 test/files/profile.json         |  7 +------
 3 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f111cc5..b688f27 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,14 +1,26 @@
-image: "rust:alpine"
+image: "archlinux:base-devel"
 
-test:cargo:
+stages:
+  - test
+  - deploy
+
+cargo:test:
+  stage: test
   script:
-    - apk add gtk4.0-dev libadwaita-dev musl-dev openssl-dev desktop-file-utils meson git
+    - pacman -Syu gtk4 libadwaita gtksourceview5 openssl desktop-file-utils meson ninja git rust bash fuse2 --needed --noconfirm
     - rustc --version && cargo --version  # Print version info for debugging
     - meson setup build -Dprefix="$PWD/build/localprefix" -Dprofile=development
     - ninja -C build
     - cargo test --workspace --verbose
+  cache:
+    paths:
+      - /var/cache/pacman
 
-# deploy:
-#   stage: deploy
-#   script: echo "Define your deployment script!"
-#   environment: production
+appimage:
+  stage: deploy
+  script:
+    - pacman -Syu gtk4 libadwaita gtksourceview5 openssl desktop-file-utils meson ninja git rust bash fuse2 --needed --noconfirm
+    - bash ./dist/appimage/build_appimage.sh
+  artifacts:
+    paths:
+      - Rex2-*.AppImage
diff --git a/dist/appimage/build_appimage.sh b/dist/appimage/build_appimage.sh
index ca4cf07..05dc217 100755
--- a/dist/appimage/build_appimage.sh
+++ b/dist/appimage/build_appimage.sh
@@ -10,9 +10,11 @@ fi
 meson setup appimage_build -Dprefix=/usr -Dprofile=development
 DESTDIR="$PWD/AppDir" ninja -C appimage_build install
 curl -SsLO https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage
+chmod +x linuxdeploy-x86_64.AppImage
 cp dist/appimage/linuxdeploy-plugin-gtk.sh ./
 
 ./linuxdeploy-x86_64.AppImage \
+    --appimage-extract-and-run \
     --appdir AppDir \
     --plugin gtk \
     --output appimage \
diff --git a/test/files/profile.json b/test/files/profile.json
index eec734b..831d21f 100644
--- a/test/files/profile.json
+++ b/test/files/profile.json
@@ -19,12 +19,7 @@
             "path": null,
             "repo": null
         },
-        "mercury": {
-            "feature_type": "Mercury",
-            "enabled": false,
-            "path": null,
-            "repo": null
-        }
+        "mercury_enabled": false
     },
     "environment": {
         "XRT_COMPOSITOR_SCALE_PERCENTAGE": "140",