[gjs: 11/15] CI: Rename "STATIC" variable to "MOZJS_BRANCH"

[Philip Chimento <pchimento src gnome org>]

commit cb89602af2f0a42db8b05964f005506fc8c05aff
Author: Philip Chimento <philip chimento gmail com>
Date:   Sat Sep 7 22:20:53 2019 -0700

    CI: Rename "STATIC" variable to "MOZJS_BRANCH"
    
    I forgot what it was for, and had trouble figuring it out, so it should
    probably be renamed to something more clear.

 .gitlab-ci.yml           | 2 +-
 test/ci-images.sh        | 4 ++--
 test/extra/do_mozilla.sh | 9 ++-------
 3 files changed, 5 insertions(+), 10 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6f600d36..c41dccfd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -375,7 +375,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 STATIC=$STATIC $IMAGE \
+          -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"
         docker commit $NAME "$CI_REGISTRY_IMAGE:$NAME"
       fi
diff --git a/test/ci-images.sh b/test/ci-images.sh
index edc05ad2..966c3cbb 100755
--- a/test/ci-images.sh
+++ b/test/ci-images.sh
@@ -26,8 +26,8 @@ if [[ -n "${BUILD_OPTS}" ]]; then
     extra_opts="($BUILD_OPTS)"
 fi
 
-if [[ -n "${STATIC}" ]]; then
-    extra_opts="$extra_opts  ($STATIC)"
+if [[ -n "${MOZJS_BRANCH}" ]]; then
+    extra_opts="$extra_opts  ($MOZJS_BRANCH)"
 fi
 
 source test/extra/do_environment.sh
diff --git a/test/extra/do_mozilla.sh b/test/extra/do_mozilla.sh
index ef7342f0..18b2c694 100755
--- a/test/extra/do_mozilla.sh
+++ b/test/extra/do_mozilla.sh
@@ -34,13 +34,8 @@ function do_Build_Mozilla(){
     echo
     echo '-- Building Mozilla SpiderMonkey --'
 
-    if [[ $STATIC == "moz52" ]]; then
-        git clone --depth 1 https://github.com/ptomato/mozjs.git -b mozjs52 /on-host/spider
-        cd /on-host/spider
-    else
-        git clone --depth 1 https://github.com/ptomato/mozjs.git -b mozjs60 /on-host/spider
-        cd /on-host/spider
-    fi
+    git clone --depth 1 https://github.com/ptomato/mozjs.git -b "${MOZJS_BRANCH:-mozjs60}" /on-host/spider
+    cd /on-host/spider
 
     mkdir -p _build
     cd _build