diff options
| author | Jordan Petridis <jpetridis@gnome.org> | 2020-08-04 09:43:25 +0000 |
|---|---|---|
| committer | Jordan Petridis <jpetridis@gnome.org> | 2020-10-06 19:10:13 +0300 |
| commit | 0cb06d9b4e3d7322b909324110bebd24aa20c6bd (patch) | |
| tree | a7ea65ec06fed93f96a0dc29d47a107b354f61b3 | |
| parent | c2565bdd0229d1b19119966acd0888bbc2671c70 (diff) | |
| download | totem-alatiera/remove-mesonargs.tar.gz | |
ci: flatpak: remove meson-args variablealatiera/remove-mesonargs
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
| -rw-r--r-- | .gitlab-ci.yml | 3 | ||||
| -rw-r--r-- | flatpak/org.gnome.Totem.Devel.json | 1 |
2 files changed, 0 insertions, 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" |