AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update emsdk-release image

Browse Source 
Bug: skia:
Change-Id: I780912e1c481765d2d17d2ce66a27470ee8b4912
Reviewed-on: https://skia-review.googlesource.com/c/168483
Reviewed-by: Kevin Lubick <kjlubick@google.com>
This commit is contained in:
Kevin Lubick 2018-11-06 07:49:40 -05:00
parent e6c8575583
commit e70c6b13dd
13 changed files with 27 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
infra/bots/recipe_modules/build/canvaskit.py
View File

@ -2,7 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be # Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file. # 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' INNER_BUILD_SCRIPT = '/SRC/skia/infra/canvaskit/build_canvaskit.sh'
BUILD_PRODUCTS_ISOLATE_WHITELIST_WASM = [ BUILD_PRODUCTS_ISOLATE_WHITELIST_WASM = [

2
infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-EMCC-asmjs-Debug-PathKit.json
View File

@ -23,7 +23,7 @@
"[START_DIR]/cache/work:/SRC", "[START_DIR]/cache/work:/SRC",
"-v", "-v",
"[START_DIR]/cache/docker/pathkit:/OUT", "[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", "/SRC/skia/infra/pathkit/build_pathkit.sh",
"debug", "debug",
"asm.js" "asm.js"

2
infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-EMCC-asmjs-Release-PathKit.json
View File

@ -23,7 +23,7 @@
"[START_DIR]/cache/work:/SRC", "[START_DIR]/cache/work:/SRC",
"-v", "-v",
"[START_DIR]/cache/docker/pathkit:/OUT", "[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", "/SRC/skia/infra/pathkit/build_pathkit.sh",
"asm.js" "asm.js"
], ],

2
infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-EMCC-wasm-Debug-CanvasKit.json
View File

@ -23,7 +23,7 @@
"[START_DIR]/cache/work:/SRC", "[START_DIR]/cache/work:/SRC",
"-v", "-v",
"[START_DIR]/cache/docker/canvaskit:/OUT", "[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", "/SRC/skia/infra/canvaskit/build_canvaskit.sh",
"debug" "debug"
], ],

2
infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-EMCC-wasm-Debug-PathKit.json
View File

@ -23,7 +23,7 @@
"[START_DIR]/cache/work:/SRC", "[START_DIR]/cache/work:/SRC",
"-v", "-v",
"[START_DIR]/cache/docker/pathkit:/OUT", "[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", "/SRC/skia/infra/pathkit/build_pathkit.sh",
"debug" "debug"
], ],

2
infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-EMCC-wasm-Release-CanvasKit_CPU.json
View File

@ -23,7 +23,7 @@
"[START_DIR]/cache/work:/SRC", "[START_DIR]/cache/work:/SRC",
"-v", "-v",
"[START_DIR]/cache/docker/canvaskit:/OUT", "[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", "/SRC/skia/infra/canvaskit/build_canvaskit.sh",
"cpu" "cpu"
], ],

2
infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-EMCC-wasm-Release-PathKit.json
View File

@ -23,7 +23,7 @@
"[START_DIR]/cache/work:/SRC", "[START_DIR]/cache/work:/SRC",
"-v", "-v",
"[START_DIR]/cache/docker/pathkit:/OUT", "[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" "/SRC/skia/infra/pathkit/build_pathkit.sh"
], ],
"env": { "env": {

2
infra/bots/recipe_modules/build/pathkit.py
View File

@ -2,7 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be # Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file. # 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' INNER_BUILD_SCRIPT = '/SRC/skia/infra/pathkit/build_pathkit.sh'
BUILD_PRODUCTS_ISOLATE_WHITELIST_WASM = [ BUILD_PRODUCTS_ISOLATE_WHITELIST_WASM = [

3
infra/canvaskit/build_canvaskit.sh
View File

@ -9,7 +9,7 @@
# is mounted at /OUT # is mounted at /OUT
# For example: # 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 +e
set -x set -x
@ -23,3 +23,4 @@ BASE_DIR=`cd $(dirname ${BASH_SOURCE[0]}) && pwd`
CANVASKIT_DIR=$BASE_DIR/../../experimental/canvaskit CANVASKIT_DIR=$BASE_DIR/../../experimental/canvaskit
BUILD_DIR=/OUT $CANVASKIT_DIR/compile.sh $@ BUILD_DIR=/OUT $CANVASKIT_DIR/compile.sh $@

3
infra/pathkit/build_pathkit.sh
View File

@ -9,7 +9,7 @@
# is mounted at /OUT # is mounted at /OUT
# For example: # 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 +e
set -x set -x
@ -23,3 +23,4 @@ BASE_DIR=`cd $(dirname ${BASH_SOURCE[0]}) && pwd`
PATHKIT_DIR=$BASE_DIR/../../modules/pathkit PATHKIT_DIR=$BASE_DIR/../../modules/pathkit
BUILD_DIR=/OUT $PATHKIT_DIR/compile.sh $@ BUILD_DIR=/OUT $PATHKIT_DIR/compile.sh $@

10
infra/pathkit/docker/Makefile
View File

@ -1,16 +1,16 @@
# TODO(kjlubick) add _v1 to this version to be like the others. EMSDK_VERSION=1.38.16_v1
EMSDK_VERSION=1.38.6_jre
# Can check CHROME_VERSION with # Can check CHROME_VERSION with
# docker run karma-chrome-tests /usr/bin/google-chrome-stable --version # docker run karma-chrome-tests /usr/bin/google-chrome-stable --version
CHROME_VERSION=68.0.3440.106_v5 CHROME_VERSION=68.0.3440.106_v5
publish_emsdk_base: 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 tag emsdk-base gcr.io/skia-public/emsdk-release:${EMSDK_VERSION}
docker push gcr.io/skia-public/emsdk-release:${EMSDK_VERSION} docker push gcr.io/skia-public/emsdk-release:${EMSDK_VERSION}
publish_karma_chrome_tests: 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 tag karma-chrome-tests gcr.io/skia-public/karma-chrome-tests:${CHROME_VERSION}
docker push gcr.io/skia-public/karma-chrome-tests:${CHROME_VERSION} docker push gcr.io/skia-public/karma-chrome-tests:${CHROME_VERSION}

11
infra/pathkit/docker/emsdk-base/Dockerfile
View File

@ -13,13 +13,16 @@ RUN cd /opt \
WORKDIR /opt/emsdk WORKDIR /opt/emsdk
# These versions were available and worked on my local desktop as of Aug 2 2018. RUN ./emsdk update-tags
RUN ./emsdk install emscripten-1.38.6 node-8.9.1-64bit clang-e1.38.6-64bit
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" RUN /bin/bash -c "source ./emsdk_env.sh"
ENV EMSDK=/opt/emsdk ENV EMSDK=/opt/emsdk
RUN mkdir -p /OUT /SRC RUN mkdir -p /OUT /SRC

5
modules/pathkit/Makefile
View File

@ -57,12 +57,12 @@ test-docker:
mkdir -p $$SKIA_ROOT/out/dockerbuild mkdir -p $$SKIA_ROOT/out/dockerbuild
docker run --rm -v $$SKIA_ROOT:/SRC -v $$SKIA_ROOT/out/dockerbuild:/OUT \ 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.js ./npm-wasm/bin/test/pathkit.js
cp ../../out/dockerbuild/pathkit.wasm ./npm-wasm/bin/test/pathkit.wasm cp ../../out/dockerbuild/pathkit.wasm ./npm-wasm/bin/test/pathkit.wasm
docker run --rm -v $$SKIA_ROOT:/SRC -v $$SKIA_ROOT/out/dockerbuild:/OUT \ 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 ./npm-asmjs/bin/test/pathkit.js
cp ../../out/dockerbuild/pathkit.js.mem ./npm-asmjs/bin/test/pathkit.js.mem 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 "Go check out localhost:8000/npm-wasm/example.html"
echo "or http://localhost:8000/npm-asmjs/example.html" echo "or http://localhost:8000/npm-asmjs/example.html"
python serve.py python serve.py