From df5626cc1f67112840e05ee8f2b9bdf8fa1f3a3b Mon Sep 17 00:00:00 2001 From: Mikkel Hjortshoej Date: Wed, 15 Apr 2020 20:13:44 +0200 Subject: [PATCH] Pass the bucket to /ci/create_nightly_json.py --- .github/workflows/nightly.yml | 2 +- ci/create_nightly_json.py | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 58129effd..a5dadb7fe 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -127,7 +127,7 @@ jobs: ./ci/upload-create-nightly.sh "$BUCKET" ubuntu-amd64 ubuntu_artifacts/ ./ci/upload-create-nightly.sh "$BUCKET" macos-amd64 macos_artifacts/ - python3 ci/create_nightly_json.py > nightly.json + python3 ci/create_nightly_json.py "$BUCKET" > nightly.json b2 upload-file "$BUCKET" nightly.json nightly.json b2 clear-account \ No newline at end of file diff --git a/ci/create_nightly_json.py b/ci/create_nightly_json.py index 43193a65d..65be4f7af 100644 --- a/ci/create_nightly_json.py +++ b/ci/create_nightly_json.py @@ -3,18 +3,20 @@ import sys import json import datetime import urllib.parse +import sys def main(): files_by_date = {} + bucket = sys.argv[1] - files_lines = execute_cli("b2 ls --long odin-binaries nightly").split("\n") + files_lines = execute_cli(f"b2 ls --long {bucket} nightly").split("\n") for x in files_lines: parts = x.split(" ", 1) if parts[0]: json_str = execute_cli(f"b2 get-file-info {parts[0]}") data = json.loads(json_str) name = remove_prefix(data['fileName'], "nightly/") - url = f"https://f001.backblazeb2.com/file/odin-binaries/nightly/{urllib.parse.quote_plus(name)}" + url = f"https://f001.backblazeb2.com/file/{bucket}/nightly/{urllib.parse.quote_plus(name)}" sha1 = data['contentSha1'] ts = int(data['fileInfo']['src_last_modified_millis']) date = datetime.datetime.fromtimestamp(ts/1000).strftime('%Y-%m-%d')