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

Enable "emsdk [install|activate] latest-upstream" (#195)

Browse Source 
This makes it possible to tell the emsdk to get "latest-upstream", which fetches the latest lkgr from there. This will probably be a common use pattern, I expect we may want to recommend users start trying out the wasm backend that way soon. This will also let us simplify this code: https://github.com/kripken/emscripten/blob/incoming/.circleci/config.yml#L334

Aside from adding the "latest-upstream" alias, this PR has

* A few minor cleanups in the emsdk code.
( Minor restructuring of how we define the upstream stuff in the manifest: It seemed odd to have 3 things (clang, emscripten, binaryen) that are all coming from a single archive from the waterfall. Simpler to have just one - the archive is one big lump, there's no way to download just part of it.
* Also add node 8.9.1 as a dependency of the upstream sdk, which makes things usable out of the box (node.js is the one thing not provided by the waterfall archive).
This commit is contained in:
Alon Zakai
2018-12-20 09:58:37 -08:00
committed by GitHub
parent 7a0e27441e
commit 889c1516fb
3 changed files with 29 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
emsdk_manifest.json
View File

@@ -191,32 +191,13 @@
"cmake_build_type": "Release"
},
{
"id": "clang",
"id": "waterfall",
"version": "upstream-%waterfall-lkgr%",
"bitness": 64,
"linux_url": "https://storage.googleapis.com/wasm-llvm/builds/linux/%waterfall-lkgr%/wasm-binaries.tbz2",
"install_path": "upstream/%waterfall-lkgr%",
"activated_path": "%installation_dir%",
"activated_cfg": "LLVM_ROOT='%installation_dir%/bin'"
},
{
"id": "emscripten",
"version": "upstream-%waterfall-lkgr%",
"bitness": 64,
"linux_url": "https://storage.googleapis.com/wasm-llvm/builds/linux/%waterfall-lkgr%/wasm-binaries.tbz2",
"install_path": "upstream/%waterfall-lkgr%",
"activated_path": "%installation_dir%",
"activated_cfg": "EMSCRIPTEN_ROOT='%installation_dir%/emscripten'"
},
{
"id": "binaryen",
"version": "upstream-%waterfall-lkgr%",
"bitness": 64,
"linux_url": "https://storage.googleapis.com/wasm-llvm/builds/linux/%waterfall-lkgr%/wasm-binaries.tbz2",
"install_path": "upstream/%waterfall-lkgr%",
"activated_path": "%installation_dir%",
"activated_cfg": "BINARYEN_ROOT='%installation_dir%'",
"activated_env": "BINARYEN_ROOT=%installation_dir%"
"activated_path": "%installation_dir%/emscripten",
"activated_cfg": "LLVM_ROOT='%installation_dir%/bin';BINARYEN_ROOT='%installation_dir%'"
},
{
"id": "clang",
@@ -1565,7 +1546,7 @@
{
"version": "upstream-%waterfall-lkgr%",
"bitness": 64,
"uses": ["clang-upstream-%waterfall-lkgr%-64bit", "emscripten-upstream-%waterfall-lkgr%-64bit", "binaryen-upstream-%waterfall-lkgr%-64bit"],
"uses": ["waterfall-upstream-%waterfall-lkgr%-64bit", "node-8.9.1-64bit"],
"os": "linux"
},
{