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

support sdk-tag-X.Y.Z-64bit (we supported it without -tag-, but that did work before) (#267)

Browse Source
This commit is contained in:
Alon Zakai
2019-06-05 14:31:44 -07:00
committed by GitHub
parent 5da4a1ae99
commit fef3dacae0
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
emsdk
View File

@@ -2414,7 +2414,7 @@ def main():
elif '-fastcomp' in arg: elif '-fastcomp' in arg:
arg = arg.replace('-fastcomp', '') arg = arg.replace('-fastcomp', '')
upstream = False upstream = False
arg = arg.replace('sdk-', '').replace('-64bit', '') arg = arg.replace('sdk-', '').replace('-64bit', '').replace('tag-', '')
release_hash = releases_info.get(arg, None) or releases_info.get('sdk-' + arg + '-64bit') release_hash = releases_info.get(arg, None) or releases_info.get('sdk-' + arg + '-64bit')
if release_hash: if release_hash:
sys.argv[i] = 'sdk-releases-%s-%s-64bit' % ('upstream' if upstream else 'fastcomp', release_hash) sys.argv[i] = 'sdk-releases-%s-%s-64bit' % ('upstream' if upstream else 'fastcomp', release_hash)

4
test.py
View File

@@ -51,5 +51,9 @@ print('test specific release (new, full name)')
check_call('./emsdk install sdk-1.38.33-upstream-64bit') check_call('./emsdk install sdk-1.38.33-upstream-64bit')
check_call('./emsdk activate sdk-1.38.33-upstream-64bit') check_call('./emsdk activate sdk-1.38.33-upstream-64bit')
print('test specific release (new, full name)')
check_call('./emsdk install sdk-tag-1.38.33-64bit')
check_call('./emsdk activate sdk-tag-1.38.33-64bit')
print('test binaryen source build') print('test binaryen source build')
check_call('./emsdk install --build=Release binaryen-master-64bit') check_call('./emsdk install --build=Release binaryen-master-64bit')