From e70c6b13dd5520f8a5470753d7b9327edb8fbd82 Mon Sep 17 00:00:00 2001 From: Kevin Lubick Date: Tue, 6 Nov 2018 07:49:40 -0500 Subject: [PATCH] Update emsdk-release image Bug: skia: Change-Id: I780912e1c481765d2d17d2ce66a27470ee8b4912 Reviewed-on: https://skia-review.googlesource.com/c/168483 Reviewed-by: Kevin Lubick --- infra/bots/recipe_modules/build/canvaskit.py | 2 +- .../Build-Debian9-EMCC-asmjs-Debug-PathKit.json | 2 +- .../Build-Debian9-EMCC-asmjs-Release-PathKit.json | 2 +- .../Build-Debian9-EMCC-wasm-Debug-CanvasKit.json | 2 +- .../Build-Debian9-EMCC-wasm-Debug-PathKit.json | 2 +- ...Build-Debian9-EMCC-wasm-Release-CanvasKit_CPU.json | 2 +- .../Build-Debian9-EMCC-wasm-Release-PathKit.json | 2 +- infra/bots/recipe_modules/build/pathkit.py | 2 +- infra/canvaskit/build_canvaskit.sh | 3 ++- infra/pathkit/build_pathkit.sh | 3 ++- infra/pathkit/docker/Makefile | 10 +++++----- infra/pathkit/docker/emsdk-base/Dockerfile | 11 +++++++---- modules/pathkit/Makefile | 5 +++-- 13 files changed, 27 insertions(+), 21 deletions(-) diff --git a/infra/bots/recipe_modules/build/canvaskit.py b/infra/bots/recipe_modules/build/canvaskit.py index ecd7440867a4e..747fa2aa7e405 100644 --- a/infra/bots/recipe_modules/build/canvaskit.py +++ b/infra/bots/recipe_modules/build/canvaskit.py @@ -2,7 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -DOCKER_IMAGE = 'gcr.io/skia-public/emsdk-release:1.38.6_jre' +DOCKER_IMAGE = 'gcr.io/skia-public/emsdk-release:1.38.16_v1' INNER_BUILD_SCRIPT = '/SRC/skia/infra/canvaskit/build_canvaskit.sh' BUILD_PRODUCTS_ISOLATE_WHITELIST_WASM = [ diff --git a/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-EMCC-asmjs-Debug-PathKit.json b/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-EMCC-asmjs-Debug-PathKit.json index 407812885132a..8fe8e22afa7ae 100644 --- a/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-EMCC-asmjs-Debug-PathKit.json +++ b/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-EMCC-asmjs-Debug-PathKit.json @@ -23,7 +23,7 @@ "[START_DIR]/cache/work:/SRC", "-v", "[START_DIR]/cache/docker/pathkit:/OUT", - "gcr.io/skia-public/emsdk-release:1.38.6_jre", + "gcr.io/skia-public/emsdk-release:1.38.16_v1", "/SRC/skia/infra/pathkit/build_pathkit.sh", "debug", "asm.js" diff --git a/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-EMCC-asmjs-Release-PathKit.json b/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-EMCC-asmjs-Release-PathKit.json index 0ca807f21a77d..201a405a59192 100644 --- a/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-EMCC-asmjs-Release-PathKit.json +++ b/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-EMCC-asmjs-Release-PathKit.json @@ -23,7 +23,7 @@ "[START_DIR]/cache/work:/SRC", "-v", "[START_DIR]/cache/docker/pathkit:/OUT", - "gcr.io/skia-public/emsdk-release:1.38.6_jre", + "gcr.io/skia-public/emsdk-release:1.38.16_v1", "/SRC/skia/infra/pathkit/build_pathkit.sh", "asm.js" ], diff --git a/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-EMCC-wasm-Debug-CanvasKit.json b/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-EMCC-wasm-Debug-CanvasKit.json index 4d84bdc123e15..33451c0f47115 100644 --- a/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-EMCC-wasm-Debug-CanvasKit.json +++ b/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-EMCC-wasm-Debug-CanvasKit.json @@ -23,7 +23,7 @@ "[START_DIR]/cache/work:/SRC", "-v", "[START_DIR]/cache/docker/canvaskit:/OUT", - "gcr.io/skia-public/emsdk-release:1.38.6_jre", + "gcr.io/skia-public/emsdk-release:1.38.16_v1", "/SRC/skia/infra/canvaskit/build_canvaskit.sh", "debug" ], diff --git a/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-EMCC-wasm-Debug-PathKit.json b/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-EMCC-wasm-Debug-PathKit.json index aa3227340b1ea..642c18a18b6d3 100644 --- a/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-EMCC-wasm-Debug-PathKit.json +++ b/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-EMCC-wasm-Debug-PathKit.json @@ -23,7 +23,7 @@ "[START_DIR]/cache/work:/SRC", "-v", "[START_DIR]/cache/docker/pathkit:/OUT", - "gcr.io/skia-public/emsdk-release:1.38.6_jre", + "gcr.io/skia-public/emsdk-release:1.38.16_v1", "/SRC/skia/infra/pathkit/build_pathkit.sh", "debug" ], diff --git a/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-EMCC-wasm-Release-CanvasKit_CPU.json b/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-EMCC-wasm-Release-CanvasKit_CPU.json index 072d7e5ecebb2..b0cf146e50fb7 100644 --- a/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-EMCC-wasm-Release-CanvasKit_CPU.json +++ b/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-EMCC-wasm-Release-CanvasKit_CPU.json @@ -23,7 +23,7 @@ "[START_DIR]/cache/work:/SRC", "-v", "[START_DIR]/cache/docker/canvaskit:/OUT", - "gcr.io/skia-public/emsdk-release:1.38.6_jre", + "gcr.io/skia-public/emsdk-release:1.38.16_v1", "/SRC/skia/infra/canvaskit/build_canvaskit.sh", "cpu" ], diff --git a/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-EMCC-wasm-Release-PathKit.json b/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-EMCC-wasm-Release-PathKit.json index 37b98b78561e4..96ee7e1a73083 100644 --- a/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-EMCC-wasm-Release-PathKit.json +++ b/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-EMCC-wasm-Release-PathKit.json @@ -23,7 +23,7 @@ "[START_DIR]/cache/work:/SRC", "-v", "[START_DIR]/cache/docker/pathkit:/OUT", - "gcr.io/skia-public/emsdk-release:1.38.6_jre", + "gcr.io/skia-public/emsdk-release:1.38.16_v1", "/SRC/skia/infra/pathkit/build_pathkit.sh" ], "env": { diff --git a/infra/bots/recipe_modules/build/pathkit.py b/infra/bots/recipe_modules/build/pathkit.py index ab89e36bd92d7..99caf4bb49696 100644 --- a/infra/bots/recipe_modules/build/pathkit.py +++ b/infra/bots/recipe_modules/build/pathkit.py @@ -2,7 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -DOCKER_IMAGE = 'gcr.io/skia-public/emsdk-release:1.38.6_jre' +DOCKER_IMAGE = 'gcr.io/skia-public/emsdk-release:1.38.16_v1' INNER_BUILD_SCRIPT = '/SRC/skia/infra/pathkit/build_pathkit.sh' BUILD_PRODUCTS_ISOLATE_WHITELIST_WASM = [ diff --git a/infra/canvaskit/build_canvaskit.sh b/infra/canvaskit/build_canvaskit.sh index 71e5d06e16a3c..dcf44a7986e77 100755 --- a/infra/canvaskit/build_canvaskit.sh +++ b/infra/canvaskit/build_canvaskit.sh @@ -9,7 +9,7 @@ # is mounted at /OUT # For example: -# docker run -v $SKIA_ROOT:/SRC -v $SKIA_ROOT/out/canvaskit:/OUT gcr.io/skia-public/emsdk-release:1.38.6_jre /SRC/infra/canvaskit/build_canvaskit.sh +# docker run -v $SKIA_ROOT:/SRC -v $SKIA_ROOT/out/canvaskit:/OUT gcr.io/skia-public/emsdk-release:1.38.16_v1 /SRC/infra/canvaskit/build_canvaskit.sh set +e set -x @@ -23,3 +23,4 @@ BASE_DIR=`cd $(dirname ${BASH_SOURCE[0]}) && pwd` CANVASKIT_DIR=$BASE_DIR/../../experimental/canvaskit BUILD_DIR=/OUT $CANVASKIT_DIR/compile.sh $@ + diff --git a/infra/pathkit/build_pathkit.sh b/infra/pathkit/build_pathkit.sh index 63a7b575e765d..7431670bd6eff 100755 --- a/infra/pathkit/build_pathkit.sh +++ b/infra/pathkit/build_pathkit.sh @@ -9,7 +9,7 @@ # is mounted at /OUT # For example: -# docker run -v $SKIA_ROOT:/SRC -v $SKIA_ROOT/out/dockerpathkit:/OUT gcr.io/skia-public/emsdk-release:1.38.6_jre /SRC/infra/pathkit/build_pathkit.sh +# docker run -v $SKIA_ROOT:/SRC -v $SKIA_ROOT/out/dockerpathkit:/OUT gcr.io/skia-public/emsdk-release:1.38.16_v1 /SRC/infra/pathkit/build_pathkit.sh set +e set -x @@ -23,3 +23,4 @@ BASE_DIR=`cd $(dirname ${BASH_SOURCE[0]}) && pwd` PATHKIT_DIR=$BASE_DIR/../../modules/pathkit BUILD_DIR=/OUT $PATHKIT_DIR/compile.sh $@ + diff --git a/infra/pathkit/docker/Makefile b/infra/pathkit/docker/Makefile index f9be8103a5334..11566579e3396 100644 --- a/infra/pathkit/docker/Makefile +++ b/infra/pathkit/docker/Makefile @@ -1,16 +1,16 @@ -# TODO(kjlubick) add _v1 to this version to be like the others. -EMSDK_VERSION=1.38.6_jre +EMSDK_VERSION=1.38.16_v1 # Can check CHROME_VERSION with # docker run karma-chrome-tests /usr/bin/google-chrome-stable --version CHROME_VERSION=68.0.3440.106_v5 publish_emsdk_base: - docker build -t emsdk-base ./emsdk-base/ + docker build --no-cache -t emsdk-base ./emsdk-base/ docker tag emsdk-base gcr.io/skia-public/emsdk-release:${EMSDK_VERSION} docker push gcr.io/skia-public/emsdk-release:${EMSDK_VERSION} publish_karma_chrome_tests: - docker build -t karma-chrome-tests ./karma-chrome-tests/ + docker build --no-cache -t karma-chrome-tests ./karma-chrome-tests/ docker tag karma-chrome-tests gcr.io/skia-public/karma-chrome-tests:${CHROME_VERSION} - docker push gcr.io/skia-public/karma-chrome-tests:${CHROME_VERSION} \ No newline at end of file + docker push gcr.io/skia-public/karma-chrome-tests:${CHROME_VERSION} + diff --git a/infra/pathkit/docker/emsdk-base/Dockerfile b/infra/pathkit/docker/emsdk-base/Dockerfile index c1efeb64571ec..27300f8bd3d8d 100644 --- a/infra/pathkit/docker/emsdk-base/Dockerfile +++ b/infra/pathkit/docker/emsdk-base/Dockerfile @@ -13,13 +13,16 @@ RUN cd /opt \ WORKDIR /opt/emsdk -# These versions were available and worked on my local desktop as of Aug 2 2018. -RUN ./emsdk install emscripten-1.38.6 node-8.9.1-64bit clang-e1.38.6-64bit +RUN ./emsdk update-tags -RUN ./emsdk activate emscripten-1.38.6 node-8.9.1-64bit clang-e1.38.6-64bit +# These versions were available and worked on my local desktop as of Nov 6 2018. +RUN ./emsdk install emscripten-1.38.16 node-8.9.1-64bit clang-e1.38.16-64bit + +RUN ./emsdk activate emscripten-1.38.16 node-8.9.1-64bit clang-e1.38.16-64bit RUN /bin/bash -c "source ./emsdk_env.sh" ENV EMSDK=/opt/emsdk -RUN mkdir -p /OUT /SRC \ No newline at end of file +RUN mkdir -p /OUT /SRC + diff --git a/modules/pathkit/Makefile b/modules/pathkit/Makefile index 701fec8ee0ec5..e3123a2bfca9b 100644 --- a/modules/pathkit/Makefile +++ b/modules/pathkit/Makefile @@ -57,12 +57,12 @@ test-docker: mkdir -p $$SKIA_ROOT/out/dockerbuild docker run --rm -v $$SKIA_ROOT:/SRC -v $$SKIA_ROOT/out/dockerbuild:/OUT \ -gcr.io/skia-public/emsdk-release:1.38.6_jre /SRC/infra/pathkit/build_pathkit.sh +gcr.io/skia-public/emsdk-release:1.38.16_v1 /SRC/infra/pathkit/build_pathkit.sh cp ../../out/dockerbuild/pathkit.js ./npm-wasm/bin/test/pathkit.js cp ../../out/dockerbuild/pathkit.wasm ./npm-wasm/bin/test/pathkit.wasm docker run --rm -v $$SKIA_ROOT:/SRC -v $$SKIA_ROOT/out/dockerbuild:/OUT \ -gcr.io/skia-public/emsdk-release:1.38.6_jre /SRC/infra/pathkit/build_pathkit.sh asm.js +gcr.io/skia-public/emsdk-release:1.38.16_v1 /SRC/infra/pathkit/build_pathkit.sh asm.js cp ../../out/dockerbuild/pathkit.js ./npm-asmjs/bin/test/pathkit.js cp ../../out/dockerbuild/pathkit.js.mem ./npm-asmjs/bin/test/pathkit.js.mem @@ -142,3 +142,4 @@ local-example-debug: echo "Go check out localhost:8000/npm-wasm/example.html" echo "or http://localhost:8000/npm-asmjs/example.html" python serve.py +