Merge branch 'alatiera/flatpak-fixups' into 'mainline'

ci: couple of flatpak fixups

See merge request GNOME/geary!537

.gitlab-ci.yml

@@ -5,9 +5,6 @@
 include: 'https://gitlab.gnome.org/GNOME/citemplates/raw/master/flatpak/flatpak_ci_initiative.yml'
 
 variables:
-  # Flatpak CI vars
-  BUNDLE: geary-dev.flatpak
-
   # ImapDB and other tests that touch the disk are super slow on CI
   # runners like gcc150.osuosl.org that use platter drives still.
   # See Infrastructure/Infrastructure#97.
@@ -89,13 +86,12 @@ flatpak:
     APP_ID: org.gnome.Geary.Devel
     FLATPAK_MODULE: geary
     MANIFEST_PATH: org.gnome.Geary.yaml
-    MESON_ARGS: "-Dprofile=development"
     RUNTIME_REPO: 'https://nightly.gnome.org/gnome-nightly.flatpakrepo'
     TEST_RUN_ARGS: $TEST_ARGS
+    BUNDLE: geary-dev.flatpak
   extends: .flatpak
 
 nightly:
   extends: '.publish_nightly'
-  only:
-    refs:
-      - mainline
+  dependencies: ['flatpak']
+  needs: ['flatpak']