[gnome-runtime-images] rust-bundle: Specify branch via `sed` instead of `echo`
- From: Jordan Petridis <jpetridis src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-runtime-images] rust-bundle: Specify branch via `sed` instead of `echo`
- Date: Tue, 16 Jul 2019 16:54:12 +0000 (UTC)
commit d663972411daa4da35b1d85e105d504eabe16e87
Author: Christopher Davis <brainblasted disroot org>
Date: Tue Jul 16 09:36:41 2019 -0700
rust-bundle: Specify branch via `sed` instead of `echo`
.gitlab-ci.yml | 16 ++++++++--------
sdk-bundles/rust-bundle.template | 2 +-
2 files changed, 9 insertions(+), 9 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 33e9cb1..030406e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -77,9 +77,9 @@ rust master:
extends: .build_template
before_script:
- export BASE_IMAGE="registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:master"
+ - export BRANCH="19.08beta"
- sed -e "s|@BASE_IMAGE@|$BASE_IMAGE|" sdk-bundles/rust-bundle.template > sdk-bundles/rust
- # specify the branch
- - echo -n "//19.08beta" >> sdk-bundles/rust
+ - sed -i "s|@BRANCH@|$BRANCH|" sdk-bundles/rust
variables:
DOCKERIMAGE: ${CI_REGISTRY_IMAGE}/rust_bundle:master
DOCKERFILE: sdk-bundles/rust
@@ -89,9 +89,9 @@ rust 3.28:
extends: .build_template
before_script:
- export BASE_IMAGE="registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:3.28"
+ - export BRANCH="1.6"
- sed -e "s|@BASE_IMAGE@|$BASE_IMAGE|" sdk-bundles/rust-bundle.template > sdk-bundles/rust
- # specify the branch
- - echo -n "//1.6" >> sdk-bundles/rust
+ - sed -i "s|@BRANCH@|$BRANCH|" sdk-bundles/rust
variables:
DOCKERIMAGE: ${CI_REGISTRY_IMAGE}/rust_bundle:3.28
DOCKERFILE: sdk-bundles/rust
@@ -101,9 +101,9 @@ rust 3.30:
extends: .build_template
before_script:
- export BASE_IMAGE="registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:3.30"
+ - export BRANCH="18.08"
- sed -e "s|@BASE_IMAGE@|$BASE_IMAGE|" sdk-bundles/rust-bundle.template > sdk-bundles/rust
- # specify the branch
- - echo -n "//18.08" >> sdk-bundles/rust
+ - sed -i "s|@BRANCH@|$BRANCH|" sdk-bundles/rust
variables:
DOCKERIMAGE: ${CI_REGISTRY_IMAGE}/rust_bundle:3.30
DOCKERFILE: sdk-bundles/rust
@@ -113,9 +113,9 @@ rust 3.32:
extends: .build_template
before_script:
- export BASE_IMAGE="registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:3.32"
+ - export BRANCH="18.08"
- sed -e "s|@BASE_IMAGE@|$BASE_IMAGE|" sdk-bundles/rust-bundle.template > sdk-bundles/rust
- # specify the branch
- - echo -n "//18.08" >> sdk-bundles/rust
+ - sed -i "s|@BRANCH@|$BRANCH|" sdk-bundles/rust
variables:
DOCKERIMAGE: ${CI_REGISTRY_IMAGE}/rust_bundle:3.32
DOCKERFILE: sdk-bundles/rust
diff --git a/sdk-bundles/rust-bundle.template b/sdk-bundles/rust-bundle.template
index 7dff170..7c610d2 100644
--- a/sdk-bundles/rust-bundle.template
+++ b/sdk-bundles/rust-bundle.template
@@ -1,3 +1,3 @@
FROM @BASE_IMAGE@
-RUN flatpak install -y org.freedesktop.Sdk.Extension.rust-stable
+RUN flatpak install -y org.freedesktop.Sdk.Extension.rust-stable//@BRANCH@
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]