[gnome-runtime-images] Add freedesktop-unstable and fix master Rust

[Jordan Petridis <jpetridis src gnome org>]

commit 8dc47e17640d66f59c19fa6a4dea09a93b555b49
Author: Jordan Petridis <jordanpetridis protonmail com>
Date:   Sun Jul 29 23:11:15 2018 +0000

    Add freedesktop-unstable and fix master Rust
    
    Use the fdo repo to source the Rust SDK extension.
    
    gnome-master is currently based ontop of fdo 18.07 sdk.
    This brakes the compatibility with the flathub rust extension

 .gitlab-ci.yml                   | 8 ++++++--
 base.yml                         | 1 +
 sdk-bundles/rust-bundle.template | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 21e1f92..8dfa029 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -65,7 +65,7 @@ gnome:3.28:
         - export OCI_YML=gnome-3-28/Dockerfile
     <<: *build
 
-rust:master:
+rust master:
     stage: rust_bundle
     before_script:
         # https://stackoverflow.com/questions/2264428/converting-string-to-lower-case-in-bash#2264537
@@ -74,10 +74,12 @@ rust:master:
         - export OCI_YML="sdk-bundles/rust.yml"
 
         - export BASE_IMAGE="registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:master"
+        - export REPO="fdo-unstable"
         - sed -e "s|@BASE_IMAGE@|$BASE_IMAGE|" sdk-bundles/rust-bundle.template > sdk-bundles/rust.yml
+        - sed -i "s|@REPO@|$REPO|" sdk-bundles/rust.yml
     <<: *build
 
-rust:3.28:
+rust 3.28:
     stage: rust_bundle
     before_script:
         # https://stackoverflow.com/questions/2264428/converting-string-to-lower-case-in-bash#2264537
@@ -86,5 +88,7 @@ rust:3.28:
         - export OCI_YML="sdk-bundles/rust.yml"
 
         - 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.yml
+        - sed -i "s|@REPO@|$REPO|" sdk-bundles/rust.yml
     <<: *build
\ No newline at end of file
diff --git a/base.yml b/base.yml
index 08caae8..48ef86f 100644
--- a/base.yml
+++ b/base.yml
@@ -9,6 +9,7 @@ RUN dnf -y update && dnf install -y flatpak-builder ostree fuse elfutils dconf g
 RUN flatpak remote-add flathub https://dl.flathub.org/repo/flathub.flatpakrepo
 RUN flatpak remote-add gnome-nightly https://sdk.gnome.org/gnome-nightly.flatpakrepo
 RUN flatpak remote-add gnome https://sdk.gnome.org/gnome.flatpakrepo
+RUN flatpak remote-add fdo-unstable https://cache.sdk.freedesktop.org/freedesktop-sdk.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..a87ff17 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
\ No newline at end of file