[totem/alatiera/remove-mesonargs] ci: flatpak: remove meson-args variable




commit 0cb06d9b4e3d7322b909324110bebd24aa20c6bd
Author: Jordan Petridis <jpetridis gnome org>
Date:   Tue Aug 4 09:43:25 2020 +0000

    ci: flatpak: remove meson-args variable
    
    The CI template was reworked to be able to parse the build
    args from the manifest itself so we no longer need to
    write them manually.
    
    The template is no longer making use of the MESON_ARGS var.
    If you need to override the args of the manifest use CONFIG_OPTS [2]
    
    [1] https://gitlab.gnome.org/GNOME/citemplates/-/merge_requests/15
    [2] https://gitlab.gnome.org/GNOME/citemplates/-/merge_requests/23#note_881242

 .gitlab-ci.yml                     | 3 ---
 flatpak/org.gnome.Totem.Devel.json | 1 -
 2 files changed, 4 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 31ff392b0..914c89fa2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -60,9 +60,6 @@ flatpak:master:
         RUNTIME_REPO: "https://nightly.gnome.org/gnome-nightly.flatpakrepo";
         # Replace with your application name, as written in the manifest
         FLATPAK_MODULE: "totem"
-        # Make sure to keep this in sync with the Flatpak manifest, all arguments
-        # are passed except the config-args because we build it ourselves
-        MESON_ARGS: "-Denable-easy-codec-installation=no -Dprofile=development"
         APP_ID: "org.gnome.Totem.Devel"
 
 nightly:
diff --git a/flatpak/org.gnome.Totem.Devel.json b/flatpak/org.gnome.Totem.Devel.json
index 98a0a4de8..e98538663 100644
--- a/flatpak/org.gnome.Totem.Devel.json
+++ b/flatpak/org.gnome.Totem.Devel.json
@@ -298,7 +298,6 @@
         {
             "name": "totem",
             "buildsystem": "meson",
-            /* Keep in sync with .gitlab-ci.yml */
             "config-opts": [
                 "-Denable-easy-codec-installation=no",
                 "-Dprofile=development"


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