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

Add git submodule update when doing a git checkout (#974)

Browse Source 
This is required to build binaryen since
https://github.com/WebAssembly/binaryen/pull/4466
This commit is contained in:
Sam Clegg
2022-01-20 14:25:43 -08:00
committed by GitHub
parent 61c35abc7a
commit 0f0ea34526
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
emsdk.py
View File

@@ -812,7 +812,7 @@ def git_clone(url, dstpath):
if GIT_CLONE_SHALLOW: if GIT_CLONE_SHALLOW:
git_clone_args += ['--depth', '1'] git_clone_args += ['--depth', '1']
print('Cloning from ' + url + '...') print('Cloning from ' + url + '...')
return run([GIT(), 'clone'] + git_clone_args + [url, dstpath]) == 0 return run([GIT(), 'clone', '--recurse-submodules'] + git_clone_args + [url, dstpath]) == 0
def git_checkout_and_pull(repo_path, branch_or_tag): def git_checkout_and_pull(repo_path, branch_or_tag):
@@ -827,7 +827,7 @@ def git_checkout_and_pull(repo_path, branch_or_tag):
return False return False
# this line assumes that the user has not gone and manually messed with the # this line assumes that the user has not gone and manually messed with the
# repo and added new remotes to ambiguate the checkout. # repo and added new remotes to ambiguate the checkout.
ret = run([GIT(), 'checkout', '--quiet', branch_or_tag], repo_path) ret = run([GIT(), 'checkout', '--recurse-submodules', '--quiet', branch_or_tag], repo_path)
if ret != 0: if ret != 0:
return False return False
# Test if branch_or_tag is a branch, or if it is a tag that needs to be updated # Test if branch_or_tag is a branch, or if it is a tag that needs to be updated
@@ -838,6 +838,7 @@ def git_checkout_and_pull(repo_path, branch_or_tag):
ret = run([GIT(), 'merge', '--ff-only', 'origin/' + branch_or_tag], repo_path) ret = run([GIT(), 'merge', '--ff-only', 'origin/' + branch_or_tag], repo_path)
if ret != 0: if ret != 0:
return False return False
run([GIT(), 'submodule', 'update', '--init'], repo_path, quiet=True)
except: except:
errlog('git operation failed!') errlog('git operation failed!')
return False return False