From bb3e0fa03f2730ec3a5b652ea002841342b987a8 Mon Sep 17 00:00:00 2001 From: Mikkel Hjortshoej Date: Thu, 23 Apr 2020 22:16:31 +0200 Subject: [PATCH 1/5] Add sizeInBytes of zip files to nightly.json generation --- ci/create_nightly_json.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ci/create_nightly_json.py b/ci/create_nightly_json.py index 65be4f7af..2fefadd00 100644 --- a/ci/create_nightly_json.py +++ b/ci/create_nightly_json.py @@ -18,6 +18,7 @@ def main(): name = remove_prefix(data['fileName'], "nightly/") url = f"https://f001.backblazeb2.com/file/{bucket}/nightly/{urllib.parse.quote_plus(name)}" sha1 = data['contentSha1'] + size = int(data['contentLength']) ts = int(data['fileInfo']['src_last_modified_millis']) date = datetime.datetime.fromtimestamp(ts/1000).strftime('%Y-%m-%d') @@ -28,6 +29,7 @@ def main(): 'name': name, 'url': url, 'sha1': sha1, + 'sizeInBytes': size, }) now = datetime.datetime.utcnow().isoformat() From 5d42a6de6eceea369fa5115863f5e3131246e0b2 Mon Sep 17 00:00:00 2001 From: Mikkel Hjortshoej Date: Thu, 23 Apr 2020 22:17:27 +0200 Subject: [PATCH 2/5] Remove llvm-binaries.zip from artifacts --- .github/workflows/nightly.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index c6b96b583..ac06bf02e 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -17,6 +17,7 @@ jobs: cd bin curl -sL https://github.com/odin-lang/Odin/releases/download/llvm-windows/llvm-binaries.zip --output llvm-binaries.zip 7z x llvm-binaries.zip > nul + rm -f llvm-binaries.zip - name: build Odin shell: cmd run: | From 04e106e06aab0a853fc2184d7ecba0f049b1a201 Mon Sep 17 00:00:00 2001 From: Mikkel Hjortshoej Date: Thu, 23 Apr 2020 22:17:49 +0200 Subject: [PATCH 3/5] Test push --- .github/workflows/nightly.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index ac06bf02e..c345a64b8 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -3,6 +3,7 @@ name: Nightly on: schedule: - cron: 0 20 * * * + push: jobs: build_windows: From b63aa0520a325d73c9479d9bb3b2422edc4f8d2a Mon Sep 17 00:00:00 2001 From: Mikkel Hjortshoej Date: Thu, 23 Apr 2020 22:30:07 +0200 Subject: [PATCH 4/5] Remove the LLVM-C.lib from nightlies and include LLVM-C.dll --- .github/workflows/nightly.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index c345a64b8..e892affdd 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -31,8 +31,11 @@ jobs: odin run examples/demo/demo.odin - name: Copy artifacts run: | +# We delete the lib here since it's only used for building + rm bin/llvm/windows/LLVM-C.lib mkdir dist cp odin.exe dist + cp LLVM-C.dll dist cp -r shared dist cp -r core dist cp -r bin dist From 51b346753a515d359e161a406ec23d7a8becdbf4 Mon Sep 17 00:00:00 2001 From: Mikkel Hjortshoej Date: Thu, 23 Apr 2020 22:30:44 +0200 Subject: [PATCH 5/5] Github actions apparently doesn't support YAML comments --- .github/workflows/nightly.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index e892affdd..72911db95 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -31,7 +31,6 @@ jobs: odin run examples/demo/demo.odin - name: Copy artifacts run: | -# We delete the lib here since it's only used for building rm bin/llvm/windows/LLVM-C.lib mkdir dist cp odin.exe dist