Skip to content

feat(emscripten): bump up emscripten #42

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 13, 2020
Merged

feat(emscripten): bump up emscripten #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
896895f
feat(emscripten): bump up emscripten
kwonoj Nov 12, 2020
0b354c8
build(protobuf): disable build target
kwonoj Nov 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,12 @@ services:
env:
global:
- DOCKER_REPO='ojkwon/arch-emscripten'
- EMSCRIPTEN_VERSION=1.39.6
- EMSCRIPTEN_VERSION=2.0.8
- PROTOBUF_VERSION=3.9.0
matrix:
- BUILD_TARGET='base'
- BUILD_TARGET='protobuf'
# disabled for now
# - BUILD_TARGET='protobuf'

matrix:
# let whole build fails if one of matrix build config fails
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ojkwon/arch-nvm-node:b1e67ca-node13.7.0-npm6.13.7
FROM ojkwon/arch-nvm-node:311b338-node15.0.0-npm7.0.9

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

RUN node -v && emcc -v

CMD emcc --version
CMD node -v && emcc -v