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

Don't install java when installing windows sdk (#1324)

Browse Source 
We use the native version of closure compiler these days so we don't
need to install java on windows IIUC.

See https://github.com/emscripten-core/emscripten/pull/20919
This commit is contained in:
Sam Clegg
2024-10-29 14:07:17 -07:00
committed by GitHub
parent 2514ec738d
commit d63e0d425a
3 changed files with 1 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
emsdk_manifest.json
View File

@@ -192,24 +192,6 @@
"activated_cfg": "PYTHON='%installation_dir%/bin/python3'",
"activated_env": "EMSDK_PYTHON=%installation_dir%/bin/python3;SSL_CERT_FILE=%installation_dir%/lib/python3.9/site-packages/certifi/cacert.pem"
},
{
"id": "java",
"version": "8.152",
"bitness": 32,
"arch": "x86",
"windows_url": "portable_jre_8_update_152_32bit.zip",
"activated_env": "JAVA_HOME=%installation_dir%",
"activated_cfg": "JAVA='%installation_dir%/bin/java%.exe%'"
},
{
"id": "java",
"version": "8.152",
"bitness": 64,
"arch": "x86_64",
"windows_url": "portable_jre_8_update_152_64bit.zip",
"activated_env": "JAVA_HOME=%installation_dir%",
"activated_cfg": "JAVA='%installation_dir%/bin/java%.exe%'"
},
{
"id": "emscripten",
"version": "tag-%tag%",
@@ -415,7 +397,7 @@
{
"version": "releases-%releases-tag%",
"bitness": 64,
"uses": ["node-20.18.0-64bit", "python-3.9.2-nuget-64bit", "java-8.152-64bit", "releases-%releases-tag%-64bit"],
"uses": ["node-20.18.0-64bit", "python-3.9.2-nuget-64bit", "releases-%releases-tag%-64bit"],
"os": "win",
"custom_install_script": "emscripten_npm_install"
}