opensourcemirror
/
cockpit
mirror of https://github.com/cockpit-project/cockpit.git
1
0
Fork 0
Code Issues Releases Wiki Activity

test: Unpack pre-built debian/copyright from our dist cache 

This can't be built without a full node_modules/, and was the only thing
that breaks `make dist` with a pre-built dist.

Unfortunately tar's `--touch` order seems to be unpredictable, and not
the order that is given on the command line. Ensure that the unpacked
debian/copyright is newer than the dist manifests.json.
This commit is contained in:
Martin Pitt 2021-04-20 10:33:10 +02:00 committed by Martin Pitt
parent 431c88bff1
commit 887cc37cac
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
test/make_dist.py
View File

@ -131,12 +131,15 @@ def download_dist(wait=False):
tar_path = os.path.realpath(names[0])
# Extract npm/webpack related files locally for speeding up the build and allowing integration tests to run
unpack_paths = [d for d in ["dist", "node_modules", "package-lock.json"] if not os.path.exists(d)]
unpack_paths = [d for d in ["dist", "node_modules", "package-lock.json", "tools/debian/copyright"] if not os.path.exists(d)]
if unpack_paths:
message("make_dist: Extracting from tarball:", ' '.join(unpack_paths))
prefix = os.path.basename(tar_path).split('.tar')[0] + '/'
prefixed_unpack_paths = [prefix + d for d in unpack_paths]
subprocess.check_call(["tar", "--touch", "--strip-components=1", "-xf", tar_path] + prefixed_unpack_paths)
# after the above, dist manifests may be newer than copyright due to tar touching order
# restore file time stamps as they would be after a build
subprocess.check_call(["touch", "tools/debian/copyright"])
return tar_path