[gjs/wip/ptomato/fix-docker: 1/3] CI: Remove check for IMAGE variable



commit 1a86fe30d0dc998c246d0a08a491451b185dc28b
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.
    
    This also creates better debugging output in the CI log, since otherwise
    all but the "if" statement was hidden.
    
    Unreviewed, pushing to fix build.

 .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]