[gnome-runtime-images] Rust ext: install the correct branch of the extension
- From: Jordan Petridis <jpetridis src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-runtime-images] Rust ext: install the correct branch of the extension
- Date: Fri, 10 Aug 2018 08:53:12 +0000 (UTC)
commit 6af25a47d5e1b8265069cfae3dc7c083ff2bace6
Author: Jordan Petridis <jordanpetridis protonmail com>
Date: Fri Aug 10 08:53:01 2018 +0000
Rust ext: install the correct branch of the extension
We no longer need to rely upon the freedesktop repository.
Everything got pulled into flathub.
.gitlab-ci.yml | 8 +++-----
sdk-bundles/rust-bundle.template | 2 +-
2 files changed, 4 insertions(+), 6 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 14a35b7..e9cff17 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -74,11 +74,9 @@ 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
# specify the branch
- - echo -n "//unstable" >> sdk-bundles/rust.yml
+ - echo -n "//18.08" >> sdk-bundles/rust.yml
<<: *build
rust 3.28:
@@ -90,7 +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
+ # specify the branch
+ - echo -n "//1.6" >> sdk-bundles/rust.yml
<<: *build
\ No newline at end of file
diff --git a/sdk-bundles/rust-bundle.template b/sdk-bundles/rust-bundle.template
index a87ff17..fadd0a7 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
\ No newline at end of file
+RUN flatpak install -y flathub org.freedesktop.Sdk.Extension.rust-stable
\ No newline at end of file
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]