[librsvg-oci-images/alatiera/cleanups] CI: Use CI_REGISTRY_IMAGE instead of hacks
- From: Jordan Petridis <jpetridis src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [librsvg-oci-images/alatiera/cleanups] CI: Use CI_REGISTRY_IMAGE instead of hacks
- Date: Sun, 2 Dec 2018 18:48:28 +0000 (UTC)
commit 07d713ed5ea91978d1a00e43380af95f486fa9c2
Author: Jordan Petridis <jpetridis gnome org>
Date: Sun Dec 2 20:47:20 2018 +0200
CI: Use CI_REGISTRY_IMAGE instead of hacks
This achieves the same thing, but there's a pre-defined gitlab
variable to do it!
.gitlab-ci.yml | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index dbaeb80..877143e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -28,8 +28,7 @@ stages:
.distro_template: &distro_build
stage: distro
before_script:
- - export NAMESPACE="$(echo "${CI_PROJECT_NAMESPACE}" | tr A-Z a-z)"
- - export IMAGE=${CI_REGISTRY}/${NAMESPACE}/${CI_PROJECT_NAME}/${ARCH}/${DISTRO_NAME}:${DISTRO_VER}
+ - export IMAGE=${CI_REGISTRY_IMAGE}/${ARCH}/${DISTRO_NAME}:${DISTRO_VER}
<<: *base_build
# Expects $COMPILER variable which should be the name of the compiler ex. rustc/gcc
@@ -38,8 +37,7 @@ stages:
.rustc_template: &rustc
stage: rustc
before_script:
- - export NAMESPACE="$(echo "${CI_PROJECT_NAMESPACE}" | tr A-Z a-z)"
- - export IMAGE=${CI_REGISTRY}/${NAMESPACE}/${CI_PROJECT_NAME}/rustc:${TAG_VERSION}
+ - export IMAGE=${CI_REGISTRY_IMAGE}/rustc:${TAG_VERSION}
- export OCI_YML=rustc.yml
- export DIR=rustc/
- sed -e "s|@RUSTC_VERSION@|$RUSTC_VERSION|" rustc/rustc_template > rustc/rustc.yml
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]