Skip to content

Commit 44bf7cf

Browse files
authored
CI: Build latest docker image rather than tot (#1359)
This means that CI run that update `latest` actually test the thing we are about to ship. We recently had a case where `latest` was broken but `tot` was fixes and we accidentally shipped a broken SDK version (#1353).
1 parent da5a192 commit 44bf7cf

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

.circleci/config.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -181,13 +181,13 @@ jobs:
181181
name: install docker
182182
command: apt-get update -q && apt-get install -q -y docker.io
183183
- setup_remote_docker
184-
# Build and test the tip-of-tree build of EMSDK
184+
# Build the `latest` version of EMSDK as docker image
185185
- run:
186186
name: build
187-
command: make -C ./docker version=tot build
187+
command: make -C ./docker version=latest build
188188
- run:
189189
name: test
190-
command: make -C ./docker version=tot test
190+
command: make -C ./docker version=latest test
191191

192192
publish-docker-image-x64:
193193
executor: bionic

docker/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ ifndef version
1414
endif
1515

1616
build: Dockerfile .TEST
17-
cd .. && docker build --network host --build-arg=EMSCRIPTEN_VERSION=${version} -t ${image_name}:${version} -f docker/$< .
17+
cd .. && docker build --progress=plain --network host --build-arg=EMSCRIPTEN_VERSION=${version} -t ${image_name}:${version} -f docker/$< .
1818

1919
test: test_dockerimage.sh .TEST
2020
# test as non-root

0 commit comments

Comments
 (0)