Skip to content

Commit

Permalink
Auto merge of #2063 - JohnTitor:asmjs-ci, r=JohnTitor
Browse files Browse the repository at this point in the history
Re-enable CI for `asmjs-unknown-emscripten`

#1591 was closed by #1697 but it was only for `wasm32-unknown-emscripten` actually. We should make a new issue and link to it instead if it's still broken.
r? `@ghost`
  • Loading branch information
bors committed Feb 10, 2021
2 parents 734bb32 + 29feed1 commit 3c907ed
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 5 deletions.
4 changes: 1 addition & 3 deletions .github/workflows/bors.yml
Original file line number Diff line number Diff line change
Expand Up @@ -109,9 +109,7 @@ jobs:
arm-linux-androideabi,
arm-unknown-linux-gnueabihf,
arm-unknown-linux-musleabihf,
# FIXME: Disabled because currently broken, see:
# https://github.com/rust-lang/libc/issues/1591
# asmjs-unknown-emscripten,
asmjs-unknown-emscripten,
i686-linux-android,
i686-unknown-linux-musl,
mips-unknown-linux-gnu,
Expand Down
13 changes: 11 additions & 2 deletions ci/docker/asmjs-unknown-emscripten/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
FROM ubuntu:20.04

RUN apt-get update && \
apt-get install -y --no-install-recommends \
# This is a workaround to avoid the interaction with tzdata.
ENV DEBIAN_FRONTEND=noninteractive
ENV TZ=America/New_York

RUN apt-get update
RUN apt-get install -y --no-install-recommends tzdata
RUN apt-get install -y --no-install-recommends \
ca-certificates \
curl \
gcc \
Expand All @@ -18,5 +23,9 @@ RUN bash /emscripten.sh
ENV PATH=$PATH:/rust/bin \
CARGO_TARGET_ASMJS_UNKNOWN_EMSCRIPTEN_RUNNER=node

# `-g4` is used by default which causes a linking error.
# Using `-g3` not to generate a source map.
ENV EMCC_CFLAGS=-g3

COPY emscripten-entry.sh /
ENTRYPOINT ["/emscripten-entry.sh"]

0 comments on commit 3c907ed

Please sign in to comment.