admin/ci-emsdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert testing changes

Browse Source
This commit is contained in:
Sam Clegg
2020-06-23 20:35:53 -07:00
parent 618fcf36ee
commit dc74092927
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
.circleci/config.yml
View File

@@ -112,19 +112,15 @@ jobs:
- setup_remote_docker - setup_remote_docker
- run: - run:
name: build name: build
# TESTING: using fixed EMSCRIPTEN_VERSION. Will revert this as command: docker build --network host --build-arg=EMSCRIPTEN_VERSION=${CIRCLE_TAG}-upstream --tag emscripten/emsdk:${CIRCLE_TAG} ./docker
# 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
- run: - run:
name: tag image 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: - run:
name: push image name: push image
command: | command: |
docker login -u "$DOCKER_USER" -p "$DOCKER_PASS" 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 docker push emscripten/emsdk:latest
workflows: workflows:

2
docker/Dockerfile
View File

@@ -3,7 +3,7 @@ FROM debian:buster AS stage_build
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
# Supports only 1.38.40+, accepts also '-upstream' variants # Supports only 1.38.40+, accepts also '-upstream' variants
ARG EMSCRIPTEN_VERSION=1.39.17 ARG EMSCRIPTEN_VERSION=1.39.18
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------