[gnome-music/wip/mschraal/3-30-flatpak] flatpak: Use 3.30 platform

[Marinus Schraal <mschraal src gnome org>]

commit 26c1f74829090858d6117c0eb2c54dbfb6376d8d
Author: Marinus Schraal <mschraal gnome org>
Date:   Tue Oct 2 09:53:48 2018 +0200

    flatpak: Use 3.30 platform

 .gitlab-ci.yml       | 6 +++---
 org.gnome.Music.json | 8 +++++---
 2 files changed, 8 insertions(+), 6 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c796caaf..fa3af3a9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:master
+image: registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:3.30
 stages:
   - check
   - build-flatpak
@@ -10,7 +10,7 @@ variables:
   FLATPAK_MODULE: "gnome-music"
   GIT_SUBMODULE_STRATEGY: normal
   MANIFEST_PATH: "org.gnome.Music.json"
-  RUNTIME_REPO: "https://sdk.gnome.org/gnome.flatpakrepo";
+  RUNTIME_REPO: "registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:3.30"
 
 flatpak:
   stage: build-flatpak
@@ -19,7 +19,7 @@ flatpak:
     - flatpak build app meson --prefix=/app _build
     - flatpak build app ninja -C _build install
     - flatpak-builder --finish-only --repo=repo app ${MANIFEST_PATH}
-    - flatpak build-bundle repo ${BUNDLE} --runtime-repo=${RUNTIME_REPO} ${DBUS_ID}
+    - flatpak build-bundle repo ${BUNDLE} ${DBUS_ID}
   artifacts:
     paths:
       - ${BUNDLE}
diff --git a/org.gnome.Music.json b/org.gnome.Music.json
index d9ee34fb..169909cf 100644
--- a/org.gnome.Music.json
+++ b/org.gnome.Music.json
@@ -1,7 +1,7 @@
 {
     "app-id": "org.gnome.Music",
     "runtime": "org.gnome.Platform",
-    "runtime-version": "master",
+    "runtime-version": "3.30",
     "sdk": "org.gnome.Sdk",
     "command": "gnome-music",
     "tags": ["stable", "3.30"],
@@ -59,7 +59,8 @@
             "sources": [
                 {
                     "type": "git",
-                    "url": "https://gitlab.gnome.org/GNOME/libdazzle.git";
+                    "url": "https://gitlab.gnome.org/GNOME/libdazzle.git";,
+                    "branch": "libdazzle-3-30"
                 }
             ]
         },
@@ -148,7 +149,8 @@
             "sources": [
                 {
                     "type": "git",
-                    "url": "https://gitlab.gnome.org/GNOME/gnome-music.git";
+                    "url": "https://gitlab.gnome.org/GNOME/gnome-music.git";,
+                    "branch": "gnome-3-30"
                 }
             ]
         }