diff options
| author | Luca Casonato <hello@lcas.dev> | 2024-01-30 20:50:54 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-30 20:50:54 +0100 |
| commit | d923705d9d6e9171332fea93e13f5e2cb7ffa5fe (patch) | |
| tree | ae41467ac45b0b0be03f971eba3e8f15ca489389 /.github | |
| parent | d730956f49e8624e789dded126f0fba514c2ed55 (diff) | |
fix: canary for arm64 macos (#22187)
This doesn't actually trigger the arm64 build job nightly yet. I'll do
that in a follow up.
Diffstat (limited to '.github')
| -rwxr-xr-x | .github/workflows/ci.generate.ts | 21 | ||||
| -rw-r--r-- | .github/workflows/ci.yml | 20 |
2 files changed, 10 insertions, 31 deletions
diff --git a/.github/workflows/ci.generate.ts b/.github/workflows/ci.generate.ts index 6d9997eff..03c9a09ae 100755 --- a/.github/workflows/ci.generate.ts +++ b/.github/workflows/ci.generate.ts @@ -747,31 +747,18 @@ const ci = { "Compress-Archive -CompressionLevel Optimal -Force -Path target/release/deno.exe -DestinationPath target/release/deno-x86_64-pc-windows-msvc.zip", }, { - name: "Upload canary to dl.deno.land (unix)", + name: "Upload canary to dl.deno.land", if: [ - "runner.os != 'Windows' &&", "matrix.job == 'test' &&", "matrix.profile == 'release' &&", "github.repository == 'denoland/deno' &&", "github.ref == 'refs/heads/main'", ].join("\n"), - run: + run: [ 'gsutil -h "Cache-Control: public, max-age=3600" cp ./target/release/*.zip gs://dl.deno.land/canary/$(git rev-parse HEAD)/', - }, - { - name: "Upload canary to dl.deno.land (windows)", - if: [ - "runner.os == 'Windows' &&", - "matrix.job == 'test' &&", - "matrix.profile == 'release' &&", - "github.repository == 'denoland/deno' &&", - "github.ref == 'refs/heads/main'", + "echo ${{ github.sha }} > canary-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"), - env: { - CLOUDSDK_PYTHON: "${{env.pythonLocation}}\\python.exe", - }, - run: - 'gsutil -h "Cache-Control: public, max-age=3600" cp ./target/release/*.zip gs://dl.deno.land/canary/$(git rev-parse HEAD)/', }, { name: "Autobahn testsuite", diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b2d9265a1..bcd5fd2d6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -437,24 +437,16 @@ jobs: github.repository == 'denoland/deno') shell: pwsh run: Compress-Archive -CompressionLevel Optimal -Force -Path target/release/deno.exe -DestinationPath target/release/deno-x86_64-pc-windows-msvc.zip - - name: Upload canary to dl.deno.land (unix) + - name: Upload canary to dl.deno.land if: |- - !(matrix.skip) && (runner.os != 'Windows' && - matrix.job == 'test' && - matrix.profile == 'release' && - github.repository == 'denoland/deno' && - github.ref == 'refs/heads/main') - run: 'gsutil -h "Cache-Control: public, max-age=3600" cp ./target/release/*.zip gs://dl.deno.land/canary/$(git rev-parse HEAD)/' - - name: Upload canary to dl.deno.land (windows) - if: |- - !(matrix.skip) && (runner.os == 'Windows' && - matrix.job == 'test' && + !(matrix.skip) && (matrix.job == 'test' && matrix.profile == 'release' && github.repository == 'denoland/deno' && github.ref == 'refs/heads/main') - env: - CLOUDSDK_PYTHON: '${{env.pythonLocation}}\python.exe' - run: 'gsutil -h "Cache-Control: public, max-age=3600" cp ./target/release/*.zip gs://dl.deno.land/canary/$(git rev-parse HEAD)/' + 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-$(rustc -vV | sed -n "s|host: ||p")-latest.txt - name: Autobahn testsuite if: |- !(matrix.skip) && (matrix.job == 'test' && matrix.profile == 'release' && |