Skip to content

bugfix checksum not constant when using git_config (#2726) #2727

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

bugfix checksum not constant when using git_config (#2726) #2727

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 15 additions & 3 deletions easybuild/tools/filetools.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1787,9 +1787,21 @@ def get_source_tarball_from_git(filename, targetdir, git_config):

run.run_cmd(' '.join(checkout_cmd), log_all=True, log_ok=False, simple=False, regexp=False, path=repo_name)

# create an archive and delete the git repo directory
tar_cmd = ['tar', 'cfvz', targetpath, '--exclude', '.git', repo_name]
run.run_cmd(' '.join(tar_cmd), log_all=True, log_ok=False, simple=False, regexp=False)
# create a git archive (in tar format, gzip later)
git_cmd = ['git', 'archive', '-o', targetpath[:-3], '--prefix=%s/' % (repo_name), 'HEAD']
run.run_cmd(' '.join(git_cmd), log_all=True, log_ok=False, simple=False, regexp=False, path=repo_name)

# git archive does not automatically recurse into submodules
if recursive:
# create a git archive for each submdule, and append it to the target
git_cmd = ['git', 'submodule', 'foreach', "'git archive -o $name.tar --prefix=%s/$path/ HEAD'" % (repo_name)]
tar_cmd = ['git', 'submodule', 'foreach', "'tar -f %s --concatenate $name.tar'" % (targetpath[:-3])]
run.run_cmd(' '.join(git_cmd), log_all=True, log_ok=False, simple=False, regexp=False, path=repo_name)
run.run_cmd(' '.join(tar_cmd), log_all=True, log_ok=False, simple=False, regexp=False, path=repo_name)

# compress (concatenated) tarball, use gzip --no-name option (omitting timestamps makes the checksum constant)
gzip_cmd = ['gzip', '-nf', targetpath[:-3]]
run.run_cmd(' '.join(gzip_cmd), log_all=True, log_ok=False, simple=False, regexp=False)

# cleanup (repo_name dir does not exist in dry run mode)
change_dir(cwd)
Expand Down
26 changes: 22 additions & 4 deletions test/framework/filetools.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1749,7 +1749,9 @@ def run_check():
expected = '\n'.join([
' running command "git clone --branch master git@github.com:hpcugent/testrepository.git"',
" \(in .*/tmp.*\)",
' running command "tar cfvz .*/target/test.tar.gz --exclude .git testrepository"',
' running command "git archive -o .*/target/test.tar --prefix=testrepository/ HEAD"',
" \(in testrepository\)",
' running command "gzip -nf .*/target/test.tar"',
" \(in .*/tmp.*\)",
])
run_check()
Expand All @@ -1758,7 +1760,14 @@ def run_check():
expected = '\n'.join([
' running command "git clone --branch master --recursive git@github.com:hpcugent/testrepository.git"',
" \(in .*/tmp.*\)",
' running command "tar cfvz .*/target/test.tar.gz --exclude .git testrepository"',
' running command "git archive -o .*/target/test.tar --prefix=testrepository/ HEAD"',
" \(in testrepository\)",
' running command "git submodule foreach ' +
'\'git archive -o \$name.tar --prefix=testrepository/\$path/ HEAD\'"',
" \(in testrepository\)",
' running command "git submodule foreach \'tar -f .*/target/test.tar --concatenate \$name.tar\'"',
" \(in testrepository\)",
' running command "gzip -nf .*/target/test.tar"',
" \(in .*/tmp.*\)",
])
run_check()
Expand All @@ -1770,7 +1779,14 @@ def run_check():
" \(in .*/tmp.*\)",
' running command "git checkout 8456f86 && git submodule update"',
" \(in testrepository\)",
' running command "tar cfvz .*/target/test.tar.gz --exclude .git testrepository"',
' running command "git archive -o .*/target/test.tar --prefix=testrepository/ HEAD"',
" \(in testrepository\)",
' running command "git submodule foreach ' +
'\'git archive -o \$name.tar --prefix=testrepository/\$path/ HEAD\'"',
" \(in testrepository\)",
' running command "git submodule foreach \'tar -f .*/target/test.tar --concatenate \$name.tar\'"',
" \(in testrepository\)",
' running command "gzip -nf .*/target/test.tar"',
" \(in .*/tmp.*\)",
])
run_check()
Expand All @@ -1781,7 +1797,9 @@ def run_check():
" \(in .*/tmp.*\)",
' running command "git checkout 8456f86"',
" \(in testrepository\)",
' running command "tar cfvz .*/target/test.tar.gz --exclude .git testrepository"',
' running command "git archive -o .*/target/test.tar --prefix=testrepository/ HEAD"',
" \(in testrepository\)",
' running command "gzip -nf .*/target/test.tar"',
" \(in .*/tmp.*\)",
])
run_check()
Expand Down