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

Remove use of incoming branches (#423)

Browse Source 
See https://github.com/emscripten-core/emscripten/issues/10067
This commit is contained in:
Sam Clegg
2020-01-14 13:59:15 -08:00
committed by GitHub
parent d30ba160ed
commit 3631f0aac3
3 changed files with 32 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

104
emsdk_manifest.json
View File

@@ -72,34 +72,6 @@
"activated_cfg": "LLVM_ROOT='%installation_dir%'",
"activated_env": "LLVM_ROOT=%installation_dir%;EMCC_WASM_BACKEND=0"
},
{
"id": "fastcomp-clang",
"version": "incoming",
"bitness": 32,
"install_path": "clang/fastcomp",
"url": "https://github.com/kripken/emscripten-fastcomp.git",
"clang_url": "https://github.com/kripken/emscripten-fastcomp-clang.git",
"git_branch": "incoming",
"custom_install_script": "build_fastcomp",
"activated_path": "%installation_dir%/%fastcomp_build_bin_dir%",
"activated_cfg": "LLVM_ROOT='%installation_dir%/%fastcomp_build_bin_dir%'",
"activated_env": "LLVM_ROOT=%installation_dir%/%fastcomp_build_bin_dir%;EMCC_WASM_BACKEND=0",
"cmake_build_type": "Release"
},
{
"id": "fastcomp-clang",
"version": "incoming",
"bitness": 64,
"install_path": "clang/fastcomp",
"git_branch": "incoming",
"url": "https://github.com/kripken/emscripten-fastcomp.git",
"clang_url": "https://github.com/kripken/emscripten-fastcomp-clang.git",
"custom_install_script": "build_fastcomp",
"activated_path": "%installation_dir%/%fastcomp_build_bin_dir%",
"activated_cfg": "LLVM_ROOT='%installation_dir%/%fastcomp_build_bin_dir%'",
"activated_env": "LLVM_ROOT=%installation_dir%/%fastcomp_build_bin_dir%;EMCC_WASM_BACKEND=0",
"cmake_build_type": "Release"
},
{
"id": "fastcomp-clang",
"version": "master",
@@ -453,27 +425,12 @@
"activated_path": "%installation_dir%",
"activated_env": "EMSCRIPTEN=%installation_dir%"
},
{
"id": "emscripten",
"version": "incoming",
"bitness": 32,
"append_bitness": false,
"url": "https://github.com/kripken/emscripten.git",
"git_branch": "incoming",
"activated_cfg": "EMSCRIPTEN_ROOT='%installation_dir%';EMSCRIPTEN_NATIVE_OPTIMIZER='%installation_dir%%generator_prefix%_32bit_optimizer/%cmake_build_type_on_win%optimizer%.exe%'",
"activated_path": "%installation_dir%",
"activated_env": "EMSCRIPTEN=%installation_dir%;EMSCRIPTEN_NATIVE_OPTIMIZER=%installation_dir%%generator_prefix%_32bit_optimizer/%cmake_build_type_on_win%optimizer%.exe%",
"cmake_build_type": "Release",
"custom_install_script": "emscripten_post_install",
"custom_is_installed_script": "is_optimizer_installed",
"custom_uninstall_script": "uninstall_optimizer"
},
{
"id": "emscripten",
"version": "master",
"bitness": 32,
"append_bitness": false,
"url": "https://github.com/kripken/emscripten.git",
"url": "https://github.com/emscripten-core/emscripten.git",
"git_branch": "master",
"activated_cfg": "EMSCRIPTEN_ROOT='%installation_dir%';EMSCRIPTEN_NATIVE_OPTIMIZER='%installation_dir%%generator_prefix%_32bit_optimizer/%cmake_build_type_on_win%optimizer%.exe%'",
"activated_path": "%installation_dir%",
@@ -483,27 +440,12 @@
"custom_is_installed_script": "is_optimizer_installed",
"custom_uninstall_script": "uninstall_optimizer"
},
{
"id": "emscripten",
"version": "incoming",
"bitness": 64,
"append_bitness": false,
"url": "https://github.com/kripken/emscripten.git",
"git_branch": "incoming",
"activated_cfg": "EMSCRIPTEN_ROOT='%installation_dir%';EMSCRIPTEN_NATIVE_OPTIMIZER='%installation_dir%%generator_prefix%_64bit_optimizer/%cmake_build_type_on_win%optimizer%.exe%'",
"activated_path": "%installation_dir%",
"activated_env": "EMSCRIPTEN=%installation_dir%;EMSCRIPTEN_NATIVE_OPTIMIZER=%installation_dir%%generator_prefix%_64bit_optimizer/%cmake_build_type_on_win%optimizer%.exe%",
"cmake_build_type": "Release",
"custom_install_script": "emscripten_post_install",
"custom_is_installed_script": "is_optimizer_installed",
"custom_uninstall_script": "uninstall_optimizer"
},
{
"id": "emscripten",
"version": "master",
"bitness": 64,
"append_bitness": false,
"url": "https://github.com/kripken/emscripten.git",
"url": "https://github.com/emscripten-core/emscripten.git",
"git_branch": "master",
"activated_cfg": "EMSCRIPTEN_ROOT='%installation_dir%';EMSCRIPTEN_NATIVE_OPTIMIZER='%installation_dir%%generator_prefix%_64bit_optimizer/%cmake_build_type_on_win%optimizer%.exe%'",
"activated_path": "%installation_dir%",
@@ -570,51 +512,21 @@
"sdks": [
{
"version": "upstream-incoming",
"version": "upstream-master",
"bitness": 64,
"uses": ["llvm-git-master-64bit", "node-12.9.1-64bit", "python-2.7.13.1-64bit", "emscripten-incoming-64bit"],
"uses": ["llvm-git-master-64bit", "node-12.9.1-64bit", "python-2.7.13.1-64bit", "emscripten-master-64bit"],
"os": "win"
},
{
"version": "upstream-incoming",
"version": "upstream-master",
"bitness": 64,
"uses": ["llvm-git-master-64bit", "node-12.9.1-64bit", "emscripten-incoming-64bit"],
"uses": ["llvm-git-master-64bit", "node-12.9.1-64bit", "emscripten-master-64bit"],
"os": "osx"
},
{
"version": "upstream-incoming",
"version": "upstream-master",
"bitness": 64,
"uses": ["llvm-git-master-64bit", "node-12.9.1-64bit", "emscripten-incoming-64bit"],
"os": "linux"
},
{
"version": "fastcomp-incoming",
"bitness": 32,
"uses": ["fastcomp-clang-incoming-32bit", "node-12.9.1-32bit", "python-2.7.13.1-32bit", "java-8.152-32bit", "emscripten-incoming-32bit", "binaryen-master-32bit"],
"os": "win"
},
{
"version": "fastcomp-incoming",
"bitness": 64,
"uses": ["fastcomp-clang-incoming-64bit", "node-12.9.1-64bit", "python-2.7.13.1-64bit", "java-8.152-64bit", "emscripten-incoming-64bit", "binaryen-master-64bit"],
"os": "win"
},
{
"version": "fastcomp-incoming",
"bitness": 64,
"uses": ["fastcomp-clang-incoming-64bit", "node-12.9.1-64bit", "emscripten-incoming-64bit", "binaryen-master-64bit"],
"os": "osx"
},
{
"version": "fastcomp-incoming",
"bitness": 32,
"uses": ["fastcomp-clang-incoming-32bit", "node-12.9.1-32bit", "emscripten-incoming-32bit", "binaryen-master-32bit"],
"os": "linux"
},
{
"version": "fastcomp-incoming",
"bitness": 64,
"uses": ["fastcomp-clang-incoming-64bit", "node-12.9.1-64bit", "emscripten-incoming-64bit", "binaryen-master-64bit"],
"uses": ["llvm-git-master-64bit", "node-12.9.1-64bit", "emscripten-master-64bit"],
"os": "linux"
},
{