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

Change default emsdk download location to emscripten-releases/deps (#254)

Browse Source 
Instead of from mozilla S3.

This should make the core python, java, node downloads work, as we have mirrored them to the new location. I think that should be everything - if we missed something, we will get an error, and so know we need to fix something.

(The non-deps downloads still use a full url to emscripten-releases in the manifest, which is not changed here.)

Also change the download location for old llvm builds to emscripten-releases/old/
This commit is contained in:
Alon Zakai
2019-05-30 14:22:07 -07:00
committed by GitHub
parent 963d839afa
commit 515f46fae8
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
emsdk
View File

@@ -33,11 +33,11 @@ EMSDK_DEV = bool(os.getenv('EMSDK_DEV')) if os.getenv('EMSDK_DEV') is not None e
if EMSDK_DEV: if EMSDK_DEV:
print('EMSDK_DEV active.') print('EMSDK_DEV active.')
emsdk_master_server = 'http://clb.demon.fi/emscripten_dev/' emsdk_master_server = 'http://clb.demon.fi/emscripten_dev/packages/'
else: else:
emsdk_master_server = 'https://s3.amazonaws.com/mozilla-games/emscripten/' emsdk_master_server = 'https://storage.googleapis.com/webassembly/emscripten-releases-builds/deps/'
emsdk_packages_url = urljoin(emsdk_master_server, 'packages/') emsdk_packages_url = emsdk_master_server
emscripten_git_repo = 'https://github.com/kripken/emscripten.git' emscripten_git_repo = 'https://github.com/kripken/emscripten.git'
binaryen_git_repo = 'https://github.com/WebAssembly/binaryen.git' binaryen_git_repo = 'https://github.com/WebAssembly/binaryen.git'

6
emsdk_manifest.json
View File

@@ -362,9 +362,9 @@
"id": "clang", "id": "clang",
"version": "e%precompiled_tag64%", "version": "e%precompiled_tag64%",
"bitness": 64, "bitness": 64,
"windows_url": "llvm/tag/win_64bit/emscripten-llvm-e%precompiled_tag64%.zip", "windows_url": "https://storage.googleapis.com/webassembly/emscripten-releases-builds/old/win/emscripten-llvm-e%precompiled_tag64%.zip",
"osx_url": "llvm/tag/osx_64bit/emscripten-llvm-e%precompiled_tag64%.tar.gz", "osx_url": "https://storage.googleapis.com/webassembly/emscripten-releases-builds/old/mac/emscripten-llvm-e%precompiled_tag64%.tar.gz",
"linux_url": "llvm/tag/linux_64bit/emscripten-llvm-e%precompiled_tag64%.tar.gz", "linux_url": "https://storage.googleapis.com/webassembly/emscripten-releases-builds/old/linux/emscripten-llvm-e%precompiled_tag64%.tar.gz",
"activated_path": "%installation_dir%", "activated_path": "%installation_dir%",
"activated_cfg": "LLVM_ROOT='%installation_dir%';EMSCRIPTEN_NATIVE_OPTIMIZER='%installation_dir%/optimizer%.exe%';BINARYEN_ROOT='%installation_dir%/binaryen'", "activated_cfg": "LLVM_ROOT='%installation_dir%';EMSCRIPTEN_NATIVE_OPTIMIZER='%installation_dir%/optimizer%.exe%';BINARYEN_ROOT='%installation_dir%/binaryen'",
"activated_env": "LLVM_ROOT=%installation_dir%;EMSCRIPTEN_NATIVE_OPTIMIZER=%installation_dir%/optimizer%.exe%;BINARYEN_ROOT=%installation_dir%/binaryen" "activated_env": "LLVM_ROOT=%installation_dir%;EMSCRIPTEN_NATIVE_OPTIMIZER=%installation_dir%/optimizer%.exe%;BINARYEN_ROOT=%installation_dir%/binaryen"