From 036503b07ea683d278e8aab09dc19d04b4aa6762 Mon Sep 17 00:00:00 2001 From: Nathaniel Nifong Date: Mon, 1 Apr 2019 15:00:57 -0400 Subject: [PATCH] Include wasm debugger in continuous build part 2 Merge branch 'master' of https://skia.googlesource.com/skia into buildwasm Two-part commit required, compile.sh changes first. needed hashbang line to run in docker Include wasm debugger in continuous build Bug: skia: Change-Id: I378bff703bdf884ca4da266d00069405ed8613d9 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/205266 Reviewed-by: Kevin Lubick Commit-Queue: Nathaniel Nifong --- docker/skia-wasm-release/Dockerfile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/docker/skia-wasm-release/Dockerfile b/docker/skia-wasm-release/Dockerfile index 247df37bbe..cd133e17e6 100644 --- a/docker/skia-wasm-release/Dockerfile +++ b/docker/skia-wasm-release/Dockerfile @@ -1,4 +1,4 @@ -# Dockerfile for building the WASM libraries used by jsfiddle.skia.org +# Dockerfile for building the WASM libraries used by jsfiddle.skia.org and debugger.skia.org FROM gcr.io/skia-public/emsdk-release:prod as builder RUN cd /tmp \ @@ -17,6 +17,9 @@ RUN /tmp/skia/skia/modules/pathkit/compile.sh # CanvasKit should be in /tmp/skia/skia/out/canvaskit_wasm RUN /tmp/skia/skia/modules/canvaskit/compile.sh +# Debugger should be in /tmp/skia/skia/out/debugger_wasm +RUN /tmp/skia/skia/experimental/wasm-skp-debugger/compile.sh + RUN cd /tmp/skia/skia && git rev-parse HEAD > /tmp/VERSION ############################################################################# @@ -36,3 +39,5 @@ COPY --from=builder /tmp/VERSION /tmp/VERSION COPY --from=builder /tmp/skia/skia/out/pathkit/pathkit* /tmp/pathkit/ COPY --from=builder /tmp/skia/skia/out/canvaskit_wasm/canvaskit* /tmp/canvaskit/ + +COPY --from=builder /tmp/skia/skia/out/debugger_wasm/debugger* /tmp/debugger/