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

Switch emscripten branch from master to main (#750)

Browse Source
This commit is contained in:
Sam Clegg
2021-03-08 15:52:14 -08:00
committed by GitHub
parent 73183b5c30
commit 67dc4b4989
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
emsdk_manifest.json
View File

@@ -381,11 +381,11 @@
}, },
{ {
"id": "emscripten", "id": "emscripten",
"version": "master", "version": "main",
"bitness": 32, "bitness": 32,
"append_bitness": false, "append_bitness": false,
"url": "https://github.com/emscripten-core/emscripten.git", "url": "https://github.com/emscripten-core/emscripten.git",
"git_branch": "master", "git_branch": "main",
"activated_cfg": "EMSCRIPTEN_ROOT='%installation_dir%'", "activated_cfg": "EMSCRIPTEN_ROOT='%installation_dir%'",
"activated_path": "%installation_dir%", "activated_path": "%installation_dir%",
"activated_env": "EMSCRIPTEN=%installation_dir%", "activated_env": "EMSCRIPTEN=%installation_dir%",
@@ -394,11 +394,11 @@
}, },
{ {
"id": "emscripten", "id": "emscripten",
"version": "master", "version": "main",
"bitness": 64, "bitness": 64,
"append_bitness": false, "append_bitness": false,
"url": "https://github.com/emscripten-core/emscripten.git", "url": "https://github.com/emscripten-core/emscripten.git",
"git_branch": "master", "git_branch": "main",
"activated_cfg": "EMSCRIPTEN_ROOT='%installation_dir%'", "activated_cfg": "EMSCRIPTEN_ROOT='%installation_dir%'",
"activated_path": "%installation_dir%", "activated_path": "%installation_dir%",
"activated_env": "EMSCRIPTEN=%installation_dir%", "activated_env": "EMSCRIPTEN=%installation_dir%",
@@ -464,55 +464,55 @@
{ {
"version": "upstream-master", "version": "upstream-master",
"bitness": 64, "bitness": 64,
"uses": ["llvm-git-main-64bit", "node-14.15.5-64bit", "python-3.7.4-pywin32-64bit", "emscripten-master-64bit", "binaryen-main-64bit"], "uses": ["llvm-git-main-64bit", "node-14.15.5-64bit", "python-3.7.4-pywin32-64bit", "emscripten-main-64bit", "binaryen-main-64bit"],
"os": "win" "os": "win"
}, },
{ {
"version": "upstream-master", "version": "upstream-master",
"bitness": 64, "bitness": 64,
"uses": ["llvm-git-main-64bit", "node-14.15.5-64bit", "python-3.7.4-2-64bit", "emscripten-master-64bit", "binaryen-main-64bit"], "uses": ["llvm-git-main-64bit", "node-14.15.5-64bit", "python-3.7.4-2-64bit", "emscripten-main-64bit", "binaryen-main-64bit"],
"os": "macos" "os": "macos"
}, },
{ {
"version": "upstream-master", "version": "upstream-master",
"bitness": 64, "bitness": 64,
"uses": ["llvm-git-main-64bit", "node-14.15.5-64bit", "emscripten-master-64bit", "binaryen-main-64bit"], "uses": ["llvm-git-main-64bit", "node-14.15.5-64bit", "emscripten-main-64bit", "binaryen-main-64bit"],
"os": "linux" "os": "linux"
}, },
{ {
"version": "upstream-master", "version": "upstream-master",
"bitness": 32, "bitness": 32,
"uses": ["llvm-git-main-32bit", "emscripten-master-32bit", "binaryen-main-32bit"], "uses": ["llvm-git-main-32bit", "emscripten-main-32bit", "binaryen-main-32bit"],
"os": "linux" "os": "linux"
}, },
{ {
"version": "fastcomp-master", "version": "fastcomp-master",
"bitness": 32, "bitness": 32,
"uses": ["fastcomp-clang-master-32bit", "node-14.15.5-32bit", "python-3.7.4-32bit", "java-8.152-32bit", "emscripten-master-32bit", "binaryen-main-32bit"], "uses": ["fastcomp-clang-master-32bit", "node-14.15.5-32bit", "python-3.7.4-32bit", "java-8.152-32bit", "emscripten-main-32bit", "binaryen-main-32bit"],
"os": "win" "os": "win"
}, },
{ {
"version": "fastcomp-master", "version": "fastcomp-master",
"bitness": 64, "bitness": 64,
"uses": ["fastcomp-clang-master-64bit", "node-14.15.5-64bit", "python-3.7.4-pywin32-64bit", "java-8.152-64bit", "emscripten-master-64bit", "binaryen-main-64bit"], "uses": ["fastcomp-clang-master-64bit", "node-14.15.5-64bit", "python-3.7.4-pywin32-64bit", "java-8.152-64bit", "emscripten-main-64bit", "binaryen-main-64bit"],
"os": "win" "os": "win"
}, },
{ {
"version": "fastcomp-master", "version": "fastcomp-master",
"bitness": 64, "bitness": 64,
"uses": ["fastcomp-clang-master-64bit", "node-14.15.5-64bit", "python-3.7.4-2-64bit", "emscripten-master-64bit", "binaryen-main-64bit"], "uses": ["fastcomp-clang-master-64bit", "node-14.15.5-64bit", "python-3.7.4-2-64bit", "emscripten-main-64bit", "binaryen-main-64bit"],
"os": "macos" "os": "macos"
}, },
{ {
"version": "fastcomp-master", "version": "fastcomp-master",
"bitness": 32, "bitness": 32,
"uses": ["fastcomp-clang-master-32bit", "node-14.15.5-32bit", "emscripten-master-32bit", "binaryen-main-32bit"], "uses": ["fastcomp-clang-master-32bit", "node-14.15.5-32bit", "emscripten-main-32bit", "binaryen-main-32bit"],
"os": "linux" "os": "linux"
}, },
{ {
"version": "fastcomp-master", "version": "fastcomp-master",
"bitness": 64, "bitness": 64,
"uses": ["fastcomp-clang-master-64bit", "node-14.15.5-64bit", "emscripten-master-64bit", "binaryen-main-64bit"], "uses": ["fastcomp-clang-master-64bit", "node-14.15.5-64bit", "emscripten-main-64bit", "binaryen-main-64bit"],
"os": "linux" "os": "linux"
}, },
{ {