From 8378fcc076b44e46203e9fc1a50d57bac73a1d8c Mon Sep 17 00:00:00 2001
From: ohfp <1813007-ohfp@users.noreply.gitlab.com>
Date: Fri, 6 Mar 2020 21:17:06 +0100
Subject: Partial rewrite of build process

Switching to an Arch based build process for easier maintenance and
using specific runners for tasks where that might be necessary.

Right now, parent/child pipelines for somewhat parallel builds for
different architectures / semi-independent pak-builds don't seem to
properly work yet due to `trigger:` not being recognized when it should,
so that's not yet implemented.
---
 flatpak/content/io.gitlab.LibreWolf.json | 37 ++++++++++++++++++--------------
 1 file changed, 21 insertions(+), 16 deletions(-)

(limited to 'flatpak/content/io.gitlab.LibreWolf.json')

diff --git a/flatpak/content/io.gitlab.LibreWolf.json b/flatpak/content/io.gitlab.LibreWolf.json
index 0e2b549..8feb9d6 100644
--- a/flatpak/content/io.gitlab.LibreWolf.json
+++ b/flatpak/content/io.gitlab.LibreWolf.json
@@ -4,22 +4,27 @@
     "runtime-version": "3.32",
     "sdk": "org.gnome.Sdk",
     "command": "librewolf",
-    "modules": [{
-        "name": "librewolf",
-        "buildsystem": "simple",
-        "build-commands": [
-            "mkdir -p /app/share && mv librewolf -t /app/share",
-            "mkdir -p /app/bin && ln -s /app/share/librewolf/librewolf /app/bin/"
-        ],
-        "sources": [{
-            "type": "dir",
-            "path": "source"
-         }]
-    }],
+    "modules": [
+        {
+            "name": "librewolf",
+            "buildsystem": "simple",
+            "build-commands": [
+                "mkdir -p /app/share && mv librewolf -t /app/share",
+                "mkdir -p /app/bin && ln -s /app/share/librewolf/librewolf /app/bin/"
+            ],
+            "sources": [
+                {
+                    "type": "dir",
+                    "path": "flatpak/source"
+                }
+            ]
+        }
+    ],
     "finish-args": [
-        "--share=ipc", "--socket=x11",  /* X11 + XShm access */
-        "--socket=wayland",             /* Wayland access */
-        "--filesystem=home:rw",         /* We want full fs access so we can read the files */
-        "--share=network"               /* Needs to talk to the network: */
+        "--share=ipc",
+        "--socket=x11",
+        "--socket=wayland",
+        "--filesystem=home:rw",
+        "--share=network"
     ]
 }
-- 
cgit