[gnome-runtime-images] Don't specify repo at all when building rust bundles



commit e04d0311d32471c70de03bf3e3c17195b9262102
Author: Christopher Davis <brainblasted disroot org>
Date:   Fri Jul 12 00:43:56 2019 -0700

    Don't specify repo at all when building rust bundles
    
    `flatpak` is now smart enough to automatically determine the
    repo as long as we specify the branch.

 .gitlab-ci.yml                   | 8 --------
 sdk-bundles/rust-bundle.template | 2 +-
 2 files changed, 1 insertion(+), 9 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7229e64..33e9cb1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -77,9 +77,7 @@ 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 "//19.08beta" >> sdk-bundles/rust
     variables:
@@ -91,9 +89,7 @@ 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:
@@ -105,9 +101,7 @@ 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:
@@ -119,9 +113,7 @@ 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/sdk-bundles/rust-bundle.template b/sdk-bundles/rust-bundle.template
index ac61fc5..7dff170 100644
--- a/sdk-bundles/rust-bundle.template
+++ b/sdk-bundles/rust-bundle.template
@@ -1,3 +1,3 @@
 FROM @BASE_IMAGE@
 
-RUN flatpak install -y @REPO@ org.freedesktop.Sdk.Extension.rust-stable
+RUN flatpak install -y org.freedesktop.Sdk.Extension.rust-stable


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]