[dia] ci: flatpak: remove meson-args variable
- From: Jordan Petridis <jpetridis src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [dia] ci: flatpak: remove meson-args variable
- Date: Mon, 3 Aug 2020 21:55:17 +0000 (UTC)
commit 3e513b70308cd22326d8f94395b992b309f5ee54
Author: Jordan Petridis <jpetridis gnome org>
Date: Mon Aug 3 21:55:16 2020 +0000
ci: flatpak: remove meson-args variable
We no longer need to manually keep it in sync with the ci.
.gitlab-ci.yml | 3 +--
build-aux/flatpak/org.gnome.Dia.json | 3 +++
2 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3b48e8c5..edf7987c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,7 +5,6 @@ include: 'https://gitlab.gnome.org/GNOME/citemplates/raw/master/flatpak/flatpak_
- _ccache/
variables:
- BUNDLE: "dia-dev.flatpak"
GIT_SUBMODULE_STRATEGY: recursive
flatpak:
@@ -13,9 +12,9 @@ flatpak:
variables:
MANIFEST_PATH: "build-aux/flatpak/org.gnome.Dia.json"
FLATPAK_MODULE: "dia"
- MESON_ARGS: "-Dtests=false"
RUNTIME_REPO: "https://nightly.gnome.org/gnome-nightly.flatpakrepo"
APP_ID: "org.gnome.Dia"
+ BUNDLE: "dia-dev.flatpak"
extends: .flatpak
nightly:
diff --git a/build-aux/flatpak/org.gnome.Dia.json b/build-aux/flatpak/org.gnome.Dia.json
index df74c422..05144d6f 100644
--- a/build-aux/flatpak/org.gnome.Dia.json
+++ b/build-aux/flatpak/org.gnome.Dia.json
@@ -81,6 +81,9 @@
{
"name": "dia",
"buildsystem": "meson",
+ "config-opts": [
+ "-Dtests=false"
+ ],
"sources": [
{
"type": "git",
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]