admin/ci-emsdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix emsdk on python3 - the values() of a dict is a view there, not a list (#241)

Browse Source 
Also add both python2 and 3 testing on CI here.

Fixes #240.
This commit is contained in:
Alon Zakai
2019-05-23 11:01:49 -07:00
committed by GitHub
parent e2434062a8
commit 7c9b5090bf
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Dockerfile
View File

@@ -8,7 +8,7 @@ COPY . /root/emsdk/
RUN cd /root/ \ RUN cd /root/ \
&& echo "int main() {}" > hello_world.cpp \ && echo "int main() {}" > hello_world.cpp \
&& apt-get update \ && apt-get update \
&& apt-get install -y python cmake build-essential openjdk-9-jre-headless \ && apt-get install -y python python3 cmake build-essential openjdk-9-jre-headless \
&& /root/emsdk/emsdk update-tags \ && /root/emsdk/emsdk update-tags \
&& echo "test latest" \ && echo "test latest" \
&& /root/emsdk/emsdk install latest \ && /root/emsdk/emsdk install latest \
@@ -30,12 +30,12 @@ RUN cd /root/ \
&& emcc hello_world.cpp -s WASM=0 \ && emcc hello_world.cpp -s WASM=0 \
&& emcc --clear-cache \ && emcc --clear-cache \
&& echo "test latest-releases-upstream" \ && echo "test latest-releases-upstream" \
&& /root/emsdk/emsdk install latest-releases-upstream \ && python2 /root/emsdk/emsdk install latest-releases-upstream \
&& /root/emsdk/emsdk activate latest-releases-upstream \ && /root/emsdk/emsdk activate latest-releases-upstream \
&& source /root/emsdk/emsdk_env.sh --build=Release \ && source /root/emsdk/emsdk_env.sh --build=Release \
&& emcc hello_world.cpp \ && emcc hello_world.cpp \
&& echo "test latest-releases-fastcomp" \ && echo "test latest-releases-fastcomp" \
&& /root/emsdk/emsdk install latest-releases-fastcomp \ && python3 /root/emsdk/emsdk install latest-releases-fastcomp \
&& /root/emsdk/emsdk activate latest-releases-fastcomp \ && /root/emsdk/emsdk activate latest-releases-fastcomp \
&& source /root/emsdk/emsdk_env.sh --build=Release \ && source /root/emsdk/emsdk_env.sh --build=Release \
&& emcc hello_world.cpp \ && emcc hello_world.cpp \

2
emsdk
View File

@@ -1875,7 +1875,7 @@ def load_releases_info():
# Get a list of tags for emscripten-releases. # Get a list of tags for emscripten-releases.
def load_releases_tags(): def load_releases_tags():
info = load_releases_info() info = load_releases_info()
return info.values() return list(info.values())
def is_string(s): def is_string(s):