Skip to content

fix: Fixed concurrent builds #65

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

Merged
merged 3 commits into from
Oct 26, 2020
Merged

fix: Fixed concurrent builds #65

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e1320a7
fix: take build_plan into account when computing hash
ahlinc Aug 26, 2020
80d0926
Don't silently ignore content by symlinks
ahlinc Oct 23, 2020
95b41be
fix: paths creation in case of concurrent builds, closes #64
ahlinc Oct 23, 2020
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
11 changes: 6 additions & 5 deletions package.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ def list_files(top_path, log=None):

results = []

for root, dirs, files in os.walk(top_path):
for root, dirs, files in os.walk(top_path, followlinks=True):
for file_name in files:
file_path = os.path.join(root, file_name)
relative_path = os.path.relpath(file_path, top_path)
Expand Down Expand Up @@ -210,7 +210,7 @@ def yesno_bool(val):
# Packaging functions

def emit_dir_content(base_dir):
for root, dirs, files in os.walk(base_dir):
for root, dirs, files in os.walk(base_dir, followlinks=True):
if root != base_dir:
yield os.path.normpath(root)
for name in files:
Expand Down Expand Up @@ -323,7 +323,7 @@ def _ensure_base_path(self, zip_filename):

if archive_dir and not os.path.exists(archive_dir):
self._log.info("creating %s", archive_dir)
os.makedirs(archive_dir)
os.makedirs(archive_dir, exist_ok=True)

def write_dirs(self, *base_dirs, prefix=None, timestamp=None):
"""
Expand Down Expand Up @@ -595,7 +595,7 @@ def emit_file(fpath, opath):
if apply(name):
yield path
else:
for root, dirs, files in os.walk(path):
for root, dirs, files in os.walk(path, followlinks=True):
o, d = norm_path(path, root)
# log.info('od: %s %s', o, d)
if root != path:
Expand Down Expand Up @@ -1047,6 +1047,7 @@ def prepare_command(args):
hash_extra_paths = [p.format(path=tf_paths) for p in hash_extra_paths]

content_hash = bpm.hash(hash_extra_paths)
content_hash.update(json.dumps(build_plan, sort_keys=True).encode())
content_hash.update(runtime.encode())
content_hash.update(hash_extra.encode())
content_hash = content_hash.hexdigest()
Expand Down Expand Up @@ -1082,7 +1083,7 @@ def prepare_command(args):
build_plan_filename = os.path.join(artifacts_dir,
'{}.plan.json'.format(content_hash))
if not os.path.exists(artifacts_dir):
os.makedirs(artifacts_dir)
os.makedirs(artifacts_dir, exist_ok=True)
with open(build_plan_filename, 'w') as f:
f.write(build_plan)

Expand Down