From dc740929277f46be7eb593ee9da6d12bd5c85e24 Mon Sep 17 00:00:00 2001 From: Sam Clegg Date: Tue, 23 Jun 2020 20:35:53 -0700 Subject: [PATCH] Revert testing changes --- .circleci/config.yml | 10 +++------- docker/Dockerfile | 2 +- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c709e3c..67ef717 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -112,19 +112,15 @@ jobs: - setup_remote_docker - run: name: build - # TESTING: using fixed EMSCRIPTEN_VERSION. Will revert this as - # soon as we've published docker image autoamtically using a test - # tag. - #command: docker build --network host --build-arg EMSCRIPTEN_VERSION=${CIRCLE_TAG} --tag emscripten/emsdk:${CIRCLE_TAG} ./docker - command: docker build --network host --build-arg EMSCRIPTEN_VERSION=1.39.18 --tag emscripten/emsdk:1.39.18 ./docker + command: docker build --network host --build-arg=EMSCRIPTEN_VERSION=${CIRCLE_TAG}-upstream --tag emscripten/emsdk:${CIRCLE_TAG} ./docker - run: name: tag image - command: docker tag emscripten/emsdk:1.39.18 emscripten/emsdk:latest + command: docker tag emscripten/emsdk:${CIRCLE_TAG} emscripten/emsdk:latest - run: name: push image command: | docker login -u "$DOCKER_USER" -p "$DOCKER_PASS" - docker push emscripten/emsdk:1.39.18 + docker push emscripten/emsdk:${CIRCLE_TAG} docker push emscripten/emsdk:latest workflows: diff --git a/docker/Dockerfile b/docker/Dockerfile index 1c1241b..57eb6c4 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -3,7 +3,7 @@ FROM debian:buster AS stage_build # ------------------------------------------------------------------------------ # Supports only 1.38.40+, accepts also '-upstream' variants -ARG EMSCRIPTEN_VERSION=1.39.17 +ARG EMSCRIPTEN_VERSION=1.39.18 # ------------------------------------------------------------------------------