curben
/
cloudflared-mirror
mirror of https://github.com/cloudflare/cloudflared.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

AUTH-3148 fixed cloudflared copy and match all the files in the checksum upload

This commit is contained in:
Dalton 2020-10-06 11:20:08 -05:00
parent a986355a61
commit d21989dba4
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
github_message.py
View File

@ -97,10 +97,11 @@ def main():
msg = release.body msg = release.body
for filename in glob.glob("artifacts/*.*"): for filepath in glob.glob("artifacts/*"):
pkg_hash = get_sha256(filename) pkg_hash = get_sha256(filepath)
# add the sha256 of the new artifact to the release message body # add the sha256 of the new artifact to the release message body
msg = update_or_add_message(msg, filename, pkg_hash) name = os.path.basename(filepath)
msg = update_or_add_message(msg, name, pkg_hash)
if args.dry_run: if args.dry_run:
logging.info("Skipping asset upload because of dry-run") logging.info("Skipping asset upload because of dry-run")

6
github_release.py
View File

@ -200,10 +200,10 @@ def main():
# copy the binary to the path # copy the binary to the path
copy_path = os.path.join(artifact_path, args.name) copy_path = os.path.join(artifact_path, args.name)
if args.path != copy_path: try:
shutil.copy(args.path, copy_path) shutil.copy(args.path, copy_path)
except shutil.SameFileError:
pass # the macOS release copy fails with being the same file (already in the artifacts directory). Catching to ignore.
except Exception as e: except Exception as e:
logging.exception(e) logging.exception(e)