From a82eb3fb3d073c9dd99748883d2cd98ff4a38903 Mon Sep 17 00:00:00 2001 From: Luca Casonato Date: Wed, 31 Jan 2024 18:32:37 +0100 Subject: ci: upload canary latest to correct path (#22210) Also don't always upload cache - this was a bug I introduced in the CI refactor. --- .github/workflows/ci.generate.ts | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to '.github/workflows/ci.generate.ts') diff --git a/.github/workflows/ci.generate.ts b/.github/workflows/ci.generate.ts index cd5e6426f..768323c9f 100755 --- a/.github/workflows/ci.generate.ts +++ b/.github/workflows/ci.generate.ts @@ -726,7 +726,7 @@ const ci = { run: [ 'gsutil -h "Cache-Control: public, max-age=3600" cp ./target/release/*.zip gs://dl.deno.land/canary/$(git rev-parse HEAD)/', "echo ${{ github.sha }} > canary-latest.txt", - 'gsutil -h "Cache-Control: no-cache" cp canary-latest.txt gs://dl.deno.land/canary-${{ matrix.arch }}-latest.txt', + 'gsutil -h "Cache-Control: no-cache" cp canary-latest.txt gs://dl.deno.land/canary-$(rustc -vV | sed -n "s|host: ||p")-latest.txt', ].join("\n"), }, { @@ -992,8 +992,7 @@ const ci = { name: "Save cache build output (main)", uses: "actions/cache/save@v3", if: - // TODO(@lucacasonato): revert before landing - "(matrix.job == 'test' || matrix.job == 'lint')", // && github.ref == 'refs/heads/main'", + "(matrix.job == 'test' || matrix.job == 'lint') && github.ref == 'refs/heads/main'", with: { path: [ "./target", -- cgit v1.2.3