diff options
| -rwxr-xr-x | .github/workflows/ci.generate.ts | 5 | ||||
| -rw-r--r-- | .github/workflows/ci.yml | 4 |
2 files changed, 4 insertions, 5 deletions
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", diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 35b0a1af3..898fcd718 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -438,7 +438,7 @@ jobs: 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 - name: Autobahn testsuite if: |- !(matrix.skip) && (matrix.os == 'linux' && @@ -623,7 +623,7 @@ jobs: draft: true - name: Save cache build output (main) uses: actions/cache/save@v3 - if: '!(matrix.skip) && ((matrix.job == ''test'' || matrix.job == ''lint''))' + if: '!(matrix.skip) && ((matrix.job == ''test'' || matrix.job == ''lint'') && github.ref == ''refs/heads/main'')' with: path: |- ./target |