[gjs: 7/8] CI: Remove BUILD_MOZ command from Docker image script



commit 074c99ee3e3d1032dc277bd28bb358fea35baf48
Author: Philip Chimento <philip chimento gmail com>
Date:   Sat Sep 14 12:07:58 2019 -0700

    CI: Remove BUILD_MOZ command from Docker image script
    
    The only thing we now do while building Docker images with this script
    is BUILD_MOZ, so just make the script always do that.

 .gitlab-ci.yml    |  2 +-
 test/ci-images.sh | 13 ++++++-------
 2 files changed, 7 insertions(+), 8 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b21588f5..f5362bca 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -377,7 +377,7 @@ zeal_11:
       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 \
-          bash -e -c "cd /on-host && test/ci-images.sh BUILD_MOZ"
+          bash -e -c "cd /on-host && test/ci-images.sh"
         docker commit $NAME "$CI_REGISTRY_IMAGE:$NAME"
       fi
 
diff --git a/test/ci-images.sh b/test/ci-images.sh
index f556b3cc..8467d2b8 100755
--- a/test/ci-images.sh
+++ b/test/ci-images.sh
@@ -96,13 +96,12 @@ do_Print_Labels  'ENVIRONMENT'
 echo "Running on: $OS"
 echo "Doing: $1 $extra_opts"
 
-if [[ $1 == "BUILD_MOZ" ]]; then
-    do_Install_Dependencies
-    do_Set_Env
-    do_Show_Info
-    do_Build_Mozilla
-    do_Shrink_Image
-fi
+do_Install_Dependencies
+do_Set_Env
+do_Show_Info
+do_Build_Mozilla
+do_Shrink_Image
+
 # Clear the environment
 unset BUILD_OPTS
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]