diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8239fb6381b909789915ee40be3ce19c337b0071..5265d7d637957d10abd57d490ba51cbca3c69985 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,7 +2,6 @@ include: 'https://gitlab.gnome.org/GNOME/citemplates/raw/master/flatpak/flatpak_ variables: GIT_SUBMODULE_STRATEGY: 'normal' - BUNDLE: "org.gnome.Calendar.Devel.flatpak" stages: - 'flatpak' @@ -16,10 +15,9 @@ flatpak:master: MANIFEST_PATH: "build-aux/flatpak/org.gnome.Calendar.json" RUNTIME_REPO: "https://nightly.gnome.org/gnome-nightly.flatpakrepo" FLATPAK_MODULE: "gnome-calendar" - # 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: "-Dtracing=true -Dprofile=development" APP_ID: "org.gnome.Calendar.Devel" + BUNDLE: "org.gnome.Calendar.Devel.flatpak" + flatpak:nightly: extends: '.publish_nightly' diff --git a/build-aux/flatpak/org.gnome.Calendar.json b/build-aux/flatpak/org.gnome.Calendar.json index d0e395ad216e543d1c13e016082a6ce80385fb29..18893ad6719cfef889aceb6c94d723f961c531fc 100644 --- a/build-aux/flatpak/org.gnome.Calendar.json +++ b/build-aux/flatpak/org.gnome.Calendar.json @@ -28,13 +28,6 @@ "--filesystem=~/.config/dconf:ro", "--env=DCONF_USER_CONFIG_DIR=.config/dconf" ], - "build-options" : { - "cflags" : "-O2 -g", - "cxxflags" : "-O2 -g", - "env" : { - "V" : "1" - } - }, "x-run-args" : [ "--debug" ],