Skip to content

Commit a205a89

Browse files
authored
Merge pull request #42 from kwonoj/bump-emcc
feat(emscripten): bump up emscripten
2 parents 05fcce1 + 0b354c8 commit a205a89

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

.travis.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,12 @@ services:
77
env:
88
global:
99
- DOCKER_REPO='ojkwon/arch-emscripten'
10-
- EMSCRIPTEN_VERSION=1.39.6
10+
- EMSCRIPTEN_VERSION=2.0.8
1111
- PROTOBUF_VERSION=3.9.0
1212
matrix:
1313
- BUILD_TARGET='base'
14-
- BUILD_TARGET='protobuf'
14+
# disabled for now
15+
# - BUILD_TARGET='protobuf'
1516

1617
matrix:
1718
# let whole build fails if one of matrix build config fails

Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ojkwon/arch-nvm-node:b1e67ca-node13.7.0-npm6.13.7
1+
FROM ojkwon/arch-nvm-node:311b338-node15.0.0-npm7.0.9
22

33
# Build time args
44
ARG BUILD_TARGET=""
@@ -27,7 +27,7 @@ RUN cd $TMPDIR && \
2727
git clone https://github.com/emscripten-core/emsdk.git && \
2828
cd emsdk && \
2929
./emsdk install $EMSCRIPTEN_VERSION && \
30-
./emsdk uninstall node-12.9.1-64bit && \
30+
./emsdk uninstall node-12.18.1-64bit && \
3131
./emsdk activate $EMSCRIPTEN_VERSION && \
3232
printf '%s\n%s\n' "source $(pwd)/emsdk_env.sh" "$(cat ~/.bashrc)" > ~/.bashrc && \
3333
sudo cp ~/.bashrc /root
@@ -66,4 +66,4 @@ USER root
6666

6767
RUN node -v && emcc -v
6868

69-
CMD emcc --version
69+
CMD node -v && emcc -v

0 commit comments

Comments
 (0)