CI tweaks : no more WITH_PYTHON, fix bash syntax

sagemath · Oct 24, 2020 · e9812be · e9812be
1 parent f976c52
commit e9812be
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/.ci/build-docker.sh b/.ci/build-docker.sh
@@ -26,7 +26,7 @@ docker_build() {
     # Docker's --cache-from does not really work with multi-stage builds: https://github.com/moby/moby/issues/34715
     # So we just have to rely on the local cache.
     time docker build -f docker/Dockerfile \
---build-arg "--build-arg "MAKEFLAGS=${MAKEFLAGS}" --build-arg "SAGE_NUM_THREADS=${SAGE_NUM_THREADS}" --build-arg "MAKEFLAGS_DOCBUILD=${MAKEFLAGS}" --build-arg "SAGE_NUM_THREADS_DOCBUILD=${SAGE_NUM_THREADS_DOCBUILD}" --build-arg ARTIFACT_BASE=$ARTIFACT_BASE $@
+--build-arg "MAKEFLAGS=${MAKEFLAGS}" --build-arg "SAGE_NUM_THREADS=${SAGE_NUM_THREADS}" --build-arg "MAKEFLAGS_DOCBUILD=${MAKEFLAGS}" --build-arg "SAGE_NUM_THREADS_DOCBUILD=${SAGE_NUM_THREADS_DOCBUILD}" --build-arg ARTIFACT_BASE=$ARTIFACT_BASE $@
 }
 
 # We use a multi-stage build /docker/Dockerfile. For the caching to be
@@ -53,7 +53,7 @@ docker tag "$DOCKER_IMAGE_CLI" "$DOCKER_IMAGE_BINDER"
 # Display the layers of this image
 docker history "$DOCKER_IMAGE_CLI"
 # Build the developer image with the build artifacts intact.
-# Note: It's important to build the dev image last because it might be tagged as ARTIFACT_BASE.
+# Note: It is important to build the dev image last because it might be tagged as ARTIFACT_BASE.
 docker_build --target sagemath-dev --tag "$DOCKER_IMAGE_DEV" .
 # Display the layers of this image
 docker history "$DOCKER_IMAGE_DEV"
diff --git a/.ci/update-env.sh b/.ci/update-env.sh
@@ -27,8 +27,6 @@ if [ -n "$CI_MONKEY_PATCH" ]; then
     $SCRIPT
 fi
 
-WITH_PYTHON=${WITH_PYTHON:-2}
-
 # From the docker documentation: "A tag name must be valid ASCII and may
 # contain lowercase and uppercase letters, digits, underscores, periods and
 # dashes. A tag name may not start with a period or a dash and may contain a
@@ -38,10 +36,6 @@ export DOCKER_TAG=`echo $DOCKER_TAG | tr -d '[:space:]' | tr -c '[:alnum:]_.-' '
 [[ -z "$DOCKER_TAG" ]] && export DOCKER_TAG=none
 [[ "$DOCKER_TAG" = "master" ]] && export DOCKER_TAG=latest
 
-if [ $WITH_PYTHON = 3 ]; then
-    export DOCKER_TAG=${DOCKER_TAG}-py3
-fi
-
 export DOCKER_IMAGE_CLI=${DOCKER_NAMESPACE:-sagemath}/sagemath:$DOCKER_TAG
 export DOCKER_IMAGE_DEV=${DOCKER_NAMESPACE:-sagemath}/sagemath-dev:$DOCKER_TAG