Skip to content

Use emsdk master branch #5972

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 1 commit into from
Dec 23, 2017
Merged

Use emsdk master branch #5972

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ jobs:
- run: |
apt-get update
apt-get install -y python cmake
wget https://s3.amazonaws.com/mozilla-games/emscripten/releases/emsdk-portable.tar.gz
tar -xf emsdk-portable.tar.gz
pushd emsdk-portable
wget https://github.com/juj/emsdk/archive/master.tar.gz
tar -xf master.tar.gz
pushd emsdk-master
./emsdk update-tags
./emsdk install latest
./emsdk activate latest
Expand All @@ -46,7 +46,7 @@ jobs:
root: ~/
# Must be relative path from root
paths:
- emsdk-portable/
- emsdk-master/
- .emscripten_cache/
- .emscripten_ports/
- .emscripten
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ RUN cd /root/ \
&& apt-get install -y python python-pip cmake build-essential openjdk-9-jre-headless \
&& pip install --upgrade pip \
&& pip install lit \
&& wget https://s3.amazonaws.com/mozilla-games/emscripten/releases/emsdk-portable.tar.gz \
&& tar -xf emsdk-portable.tar.gz \
&& pushd emsdk-portable \
&& wget https://github.com/juj/emsdk/archive/master.tar.gz \
&& tar -xf master.tar.gz \
&& pushd emsdk-master \
&& ./emsdk update-tags \
&& ./emsdk install latest \
&& ./emsdk activate latest \
Expand Down