[gnome-builder] ci: flatpak: remove meson-args variable
- From: Jordan Petridis <jpetridis src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-builder] ci: flatpak: remove meson-args variable
- Date: Mon, 3 Aug 2020 20:47:41 +0000 (UTC)
commit eb108653a44120ba7f719053f4998d5f1ba1a17a
Author: Jordan Petridis <jpetridis gnome org>
Date: Mon Aug 3 20:47:40 2020 +0000
ci: flatpak: remove meson-args variable
We no longer need to manually keep it in sync with the ci.
.gitlab-ci.yml | 15 ++-------------
build-aux/flatpak/org.gnome.Builder.json | 1 -
2 files changed, 2 insertions(+), 14 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d9c8d9494..674fe53e4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,8 +1,5 @@
include: 'https://gitlab.gnome.org/GNOME/citemplates/raw/master/flatpak/flatpak_ci_initiative.yml'
-variables:
- BUNDLE: "gnome-builder-git.flatpak"
-
flatpak:
extends: .flatpak
variables:
@@ -14,16 +11,8 @@ flatpak:
# Replace with your application name, as written in the manifest
FLATPAK_MODULE: "gnome-builder"
APP_ID: "org.gnome.Builder"
- # 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: |
- --buildtype=debugoptimized
- -Dctags_path=/app/bin/ctags
- -Dtcmalloc=true
- -Dtracing=true
- -Dhelp=true
- -Dchannel=flatpak-nightly
- -Dplugin_deviced=true
+ BUNDLE: "gnome-builder-git.flatpak"
+
nightly:
extends: '.publish_nightly'
diff --git a/build-aux/flatpak/org.gnome.Builder.json b/build-aux/flatpak/org.gnome.Builder.json
index 95bf6fe36..73f6a642d 100644
--- a/build-aux/flatpak/org.gnome.Builder.json
+++ b/build-aux/flatpak/org.gnome.Builder.json
@@ -636,7 +636,6 @@
"builddir" : true,
"config-opts" : [
"--libdir=lib",
- "--buildtype=debugoptimized",
"-Dctags_path=/app/bin/ctags",
"-Dtcmalloc=true",
"-Dpython_libprefix=python3.7",
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]