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

bugfix: allow to install SDK binaries alone (#834)

Browse Source
This commit is contained in:
Yulong Wang
2021-06-08 10:57:29 -07:00
committed by GitHub
parent 57b8067188
commit 9fca4702ac
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
emsdk.py
View File

@@ -2812,6 +2812,7 @@ def expand_sdk_name(name, activating):
fullname = fullname.replace('-fastcomp', '') fullname = fullname.replace('-fastcomp', '')
backend = 'fastcomp' backend = 'fastcomp'
version = fullname.replace('sdk-', '').replace('releases-', '').replace('-64bit', '').replace('tag-', '') version = fullname.replace('sdk-', '').replace('releases-', '').replace('-64bit', '').replace('tag-', '')
sdk = 'sdk-' if not name.startswith('releases-') else ''
releases_info = load_releases_info()['releases'] releases_info = load_releases_info()['releases']
release_hash = get_release_hash(version, releases_info) release_hash = get_release_hash(version, releases_info)
if release_hash: if release_hash:
@@ -2823,7 +2824,7 @@ def expand_sdk_name(name, activating):
backend = 'upstream' backend = 'upstream'
else: else:
backend = 'fastcomp' backend = 'fastcomp'
full_name = 'sdk-releases-%s-%s-64bit' % (backend, release_hash) full_name = '%sreleases-%s-%s-64bit' % (sdk, backend, release_hash)
print("Resolving SDK version '%s' to '%s'" % (version, full_name)) print("Resolving SDK version '%s' to '%s'" % (version, full_name))
return full_name return full_name
@@ -2832,7 +2833,7 @@ def expand_sdk_name(name, activating):
backend = 'upstream' backend = 'upstream'
global extra_release_tag global extra_release_tag
extra_release_tag = version extra_release_tag = version
return 'sdk-releases-%s-%s-64bit' % (backend, version) return '%sreleases-%s-%s-64bit' % (sdk, backend, version)
return name return name

4
test/test.py
View File

@@ -258,6 +258,10 @@ int main() {
# Check that its not re-downloaded # Check that its not re-downloaded
checked_call_with_output(emsdk + ' install 5c776e6a91c0cb8edafca16a652ee1ee48f4f6d2', expected='Skipped', unexpected='Downloading:') checked_call_with_output(emsdk + ' install 5c776e6a91c0cb8edafca16a652ee1ee48f4f6d2', expected='Skipped', unexpected='Downloading:')
def test_install_tool(self):
# Test that its possible to install emscripten as tool instead of SDK
checked_call_with_output(emsdk + ' install releases-upstream-77b065ace39e6ab21446e13f92897f956c80476a', unexpected='Installing SDK')
if __name__ == '__main__': if __name__ == '__main__':
unittest.main(verbosity=2) unittest.main(verbosity=2)