Remove waterfall integration (#246)
We can remove this now that we have emscripten-releases working and use it everywhere we used the emsdk's waterfall integration. In particular this should fix the current lkgr.json errors people are seeing (by removing all the lkgr stuff), which I believe started when I refactored that code while doing the releases work - I must have gotten something wrong on non-linux OSes. But anyhow, easier to remove that unnecessary code than fix it at this point.
This commit is contained in:
14
Dockerfile
14
Dockerfile
@@ -15,18 +15,6 @@ RUN cd /root/ \
|
||||
&& /root/emsdk/emsdk activate latest \
|
||||
&& source /root/emsdk/emsdk_env.sh --build=Release \
|
||||
&& emcc hello_world.cpp \
|
||||
&& echo "test upstream (waterfall)" \
|
||||
&& /root/emsdk/emsdk install latest-upstream \
|
||||
&& /root/emsdk/emsdk activate latest-upstream \
|
||||
&& source /root/emsdk/emsdk_env.sh --build=Release \
|
||||
&& emcc hello_world.cpp \
|
||||
&& python -c "import os ; assert open(os.path.expanduser('~/.emscripten')).read().count('LLVM_ROOT') == 1" \
|
||||
&& python -c "import os ; assert 'upstream' in open(os.path.expanduser('~/.emscripten')).read()" \
|
||||
&& echo "test fastcomp (waterfall)" \
|
||||
&& /root/emsdk/emsdk install latest-fastcomp \
|
||||
&& /root/emsdk/emsdk activate latest-fastcomp \
|
||||
&& source /root/emsdk/emsdk_env.sh --build=Release \
|
||||
&& emcc hello_world.cpp \
|
||||
&& emcc hello_world.cpp -s WASM=0 \
|
||||
&& emcc --clear-cache \
|
||||
&& echo "test latest-releases-upstream" \
|
||||
@@ -34,6 +22,8 @@ RUN cd /root/ \
|
||||
&& /root/emsdk/emsdk activate latest-releases-upstream \
|
||||
&& source /root/emsdk/emsdk_env.sh --build=Release \
|
||||
&& emcc hello_world.cpp \
|
||||
&& python -c "import os ; assert open(os.path.expanduser('~/.emscripten')).read().count('LLVM_ROOT') == 1" \
|
||||
&& python -c "import os ; assert 'upstream' in open(os.path.expanduser('~/.emscripten')).read()" \
|
||||
&& echo "test latest-releases-fastcomp" \
|
||||
&& python3 /root/emsdk/emsdk install latest-releases-fastcomp \
|
||||
&& /root/emsdk/emsdk activate latest-releases-fastcomp \
|
||||
|
||||
Reference in New Issue
Block a user