[gnome-runtime-images] Add flathub_beta and specify repo for master rust bundle

[Jordan Petridis <jpetridis src gnome org>]

commit cca2b935f848b2e10933879588693f452c9165eb
Author: Christopher Davis <brainblasted disroot org>
Date:   Fri Jul 12 00:24:10 2019 -0700

    Add flathub_beta and specify repo for master rust bundle
    
    The freedesktop SDK required to build with GNOME master is
    branch 19.08beta. This branch is available on flathub_beta
    instead of flathub. With this commit specify the repo
    & update the branch to 19.08beta.

 .gitlab-ci.yml                   | 10 +++++++++-
 base                             |  4 ++--
 sdk-bundles/rust-bundle.template |  2 +-
 3 files changed, 12 insertions(+), 4 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cb893f4..7229e64 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -77,9 +77,11 @@ rust master:
     extends: .build_template
     before_script:
         - export BASE_IMAGE="registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:master"
+        - export REPO="flathub_beta"
         - sed -e "s|@BASE_IMAGE@|$BASE_IMAGE|" sdk-bundles/rust-bundle.template > sdk-bundles/rust
+        - sed -i "s|@REPO@|$REPO|" sdk-bundles/rust
         # specify the branch
-        - echo -n "//18.08" >> sdk-bundles/rust
+        - echo -n "//19.08beta" >> sdk-bundles/rust
     variables:
         DOCKERIMAGE: ${CI_REGISTRY_IMAGE}/rust_bundle:master
         DOCKERFILE: sdk-bundles/rust
@@ -89,7 +91,9 @@ rust 3.28:
     extends: .build_template
     before_script:
         - export BASE_IMAGE="registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:3.28"
+        - export REPO="flathub"
         - sed -e "s|@BASE_IMAGE@|$BASE_IMAGE|" sdk-bundles/rust-bundle.template > sdk-bundles/rust
+        - sed -i "s|@REPO@|$REPO|" sdk-bundles/rust
         # specify the branch
         - echo -n "//1.6" >> sdk-bundles/rust
     variables:
@@ -101,7 +105,9 @@ rust 3.30:
     extends: .build_template
     before_script:
         - export BASE_IMAGE="registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:3.30"
+        - export REPO="flathub"
         - sed -e "s|@BASE_IMAGE@|$BASE_IMAGE|" sdk-bundles/rust-bundle.template > sdk-bundles/rust
+        - sed -i "s|@REPO@|$REPO|" sdk-bundles/rust
         # specify the branch
         - echo -n "//18.08" >> sdk-bundles/rust
     variables:
@@ -113,7 +119,9 @@ rust 3.32:
     extends: .build_template
     before_script:
         - export BASE_IMAGE="registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:3.32"
+        - export REPO="flathub"
         - sed -e "s|@BASE_IMAGE@|$BASE_IMAGE|" sdk-bundles/rust-bundle.template > sdk-bundles/rust
+        - sed -i "s|@REPO@|$REPO|" sdk-bundles/rust
         # specify the branch
         - echo -n "//18.08" >> sdk-bundles/rust
     variables:
diff --git a/base b/base
index c5fdd6e..8ee8ea1 100644
--- a/base
+++ b/base
@@ -10,8 +10,8 @@ RUN dnf -y update && \
     dnf clean all
 
 RUN flatpak remote-add flathub https://dl.flathub.org/repo/flathub.flatpakrepo && \
-    flatpak remote-add gnome-nightly https://sdk.gnome.org/gnome-nightly.flatpakrepo
-# RUN flatpak remote-add freedesktop-staging https://cache.sdk.freedesktop.org/freedesktop-sdk.flatpakrepo
+    flatpak remote-add gnome-nightly https://sdk.gnome.org/gnome-nightly.flatpakrepo && \
+    flatpak remote-add flathub_beta https://flathub.org/beta-repo/flathub-beta.flatpakrepo
 
 # Add a machine-id as specified in the freedesktop spec:
 # https://www.freedesktop.org/software/systemd/man/machine-id.html
diff --git a/sdk-bundles/rust-bundle.template b/sdk-bundles/rust-bundle.template
index fadd0a7..ac61fc5 100644
--- a/sdk-bundles/rust-bundle.template
+++ b/sdk-bundles/rust-bundle.template
@@ -1,3 +1,3 @@
 FROM @BASE_IMAGE@
 
-RUN flatpak install -y flathub org.freedesktop.Sdk.Extension.rust-stable
\ No newline at end of file
+RUN flatpak install -y @REPO@ org.freedesktop.Sdk.Extension.rust-stable