[gjs/wip/ptomato/fix-docker] CI: Remove check for IMAGE variable
- From: Philip Chimento <pchimento src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gjs/wip/ptomato/fix-docker] CI: Remove check for IMAGE variable
- Date: Sat, 21 Sep 2019 19:31:32 +0000 (UTC)
commit 81cd8894bb3444cd49f9ff1efcdc5f0387825eef
Author: Philip Chimento <philip chimento gmail com>
Date: Sat Sep 21 12:30:30 2019 -0700
CI: Remove check for IMAGE variable
The IMAGE variable is now always defined in the jobs that use this
script, so don't bother checking for it.
.gitlab-ci.yml | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 975239cf..482f2056 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -373,13 +373,10 @@ zeal_11:
- *CI_header
# Where the real magic happens
- - |
- if [[ -n "${IMAGE}" ]]; then
- docker run --name $NAME -v $(pwd):/on-host \
- -e OS=$IMAGE -e BUILD_OPTS=$BUILD_OPTS -e CC=gcc -e MOZJS_BRANCH=$MOZJS_BRANCH $IMAGE \
+ - docker run --name $NAME -v $(pwd):/on-host \
+ -e OS=$IMAGE -e BUILD_OPTS=$BUILD_OPTS -e CC=gcc -e MOZJS_BRANCH=$MOZJS_BRANCH $IMAGE \
bash -e -c "cd /on-host && test/ci-images.sh"
- docker commit $NAME "$CI_REGISTRY_IMAGE:$NAME"
- fi
+ - docker commit $NAME "$CI_REGISTRY_IMAGE:$NAME"
# Prepare to publish
- docker tag "$CI_REGISTRY_IMAGE:$NAME" "$CI_REGISTRY_IMAGE:job-"$CI_JOB_ID"_$NAME"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]