[devhelp/ebassi/devel-profile: 3/3] ci: Always build the development profile




commit 272dcf2de6ac3d96967725b5bd1f43bc29aca118
Author: Emmanuele Bassi <ebassi gnome org>
Date:   Tue Apr 13 16:14:28 2021 +0100

    ci: Always build the development profile
    
    And add a manifest for the stable profile.

 .gitlab-ci.yml                                 |  7 ++--
 build-aux/flatpak/README.md                    |  4 ++-
 build-aux/flatpak/org.gnome.Devhelp.Devel.json | 47 ++++++++++++++++++++++++++
 build-aux/flatpak/org.gnome.Devhelp.json       |  4 ++-
 4 files changed, 55 insertions(+), 7 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 96109abd..8bc964ab 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -12,13 +12,10 @@ flatpak:
   stage: build
   extends: .flatpak
   variables:
-    MANIFEST_PATH: "build-aux/flatpak/org.gnome.Devhelp.json"
+    MANIFEST_PATH: "build-aux/flatpak/org.gnome.Devhelp.Devel.json"
     FLATPAK_MODULE: "devhelp"
-    APP_ID: "org.gnome.Devhelp"
+    APP_ID: "org.gnome.Devhelp.Devel"
     RUNTIME_REPO: "https://nightly.gnome.org/gnome-nightly.flatpakrepo";
-    CONFIG_OPTS: >-
-      -Dflatpak_build=true
-      -Dgtk_doc=false
 
 nightly:
   extends: .publish_nightly
diff --git a/build-aux/flatpak/README.md b/build-aux/flatpak/README.md
index d453bcce..24fcd522 100644
--- a/build-aux/flatpak/README.md
+++ b/build-aux/flatpak/README.md
@@ -1,7 +1,9 @@
 Flatpak for Devhelp
 ===================
 
- - `org.gnome.Devhelp.json`: the Flatpak-builder manifest for Devhelp
+ - `org.gnome.Devhelp.json`: the Flatpak manifest for Devhelp
+ - `org.gnome.Devhelp.Devel.json`: The Flatpak manifest for Devhelp's
+   development profile
  - `run-flatpak.sh`: a utility script for building, running, and uninstalling
    the Devhelp Flatpak
 
diff --git a/build-aux/flatpak/org.gnome.Devhelp.Devel.json b/build-aux/flatpak/org.gnome.Devhelp.Devel.json
new file mode 100644
index 00000000..30746424
--- /dev/null
+++ b/build-aux/flatpak/org.gnome.Devhelp.Devel.json
@@ -0,0 +1,47 @@
+{
+    "app-id" : "org.gnome.Devhelp.Devel",
+    "runtime" : "org.gnome.Sdk",
+    "runtime-version" : "master",
+    "sdk" : "org.gnome.Sdk",
+    "command" : "devhelp",
+    "tags" : [
+        "nightly"
+    ],
+    "desktop-file-name-prefix" : "(Development) ",
+    "finish-args" : [
+        "--share=ipc",
+        "--socket=x11",
+        "--socket=wayland",
+        "--device=dri",
+        "--filesystem=host:ro"
+    ],
+    "cleanup" : [
+        "/include",
+        "/lib/pkgconfig",
+        "/share/pkgconfig",
+        "share/aclocal",
+        "man",
+        "share/man",
+        "*.la",
+        "*.a"
+    ],
+    "modules" : [
+        {
+            "name" : "devhelp",
+            "buildsystem" : "meson",
+            "config-opts" : [
+                "-Dflatpak_build=true",
+                "-Dprofile=devel",
+                "-Dgtk_doc=false"
+            ],
+            "run-tests" : true,
+            "sources" : [
+                {
+                    "type" : "git",
+                    "url" : "https://gitlab.gnome.org/GNOME/devhelp.git";,
+                    "branch" : "master"
+                }
+            ]
+        }
+    ]
+}
diff --git a/build-aux/flatpak/org.gnome.Devhelp.json b/build-aux/flatpak/org.gnome.Devhelp.json
index a2d1372d..2c7cdd83 100644
--- a/build-aux/flatpak/org.gnome.Devhelp.json
+++ b/build-aux/flatpak/org.gnome.Devhelp.json
@@ -30,7 +30,9 @@
             "name" : "devhelp",
             "buildsystem" : "meson",
             "config-opts" : [
-                "-Dflatpak_build=true"
+                "-Dflatpak_build=true",
+                "-Dprofile=stable",
+                "-Dgtk_doc=false"
             ],
             "run-tests" : true,
             "sources" : [


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]