1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2024-12-23 15:49:44 -05:00

chore(ci): fix canary publish on main (#17374)

Ref #17358
This commit is contained in:
David Sherret 2023-01-12 12:53:47 -05:00 committed by David Sherret
parent 23dea8e89a
commit 09c183f4a0
2 changed files with 14 additions and 18 deletions

View file

@ -108,13 +108,6 @@ const installDenoStep = {
const authenticateWithGoogleCloud = {
name: "Authenticate with Google Cloud",
if: [
"matrix.profile == 'release' &&",
"matrix.job == 'test' &&",
"github.repository == 'denoland/deno' &&",
"(github.ref == 'refs/heads/main' ||",
"startsWith(github.ref, 'refs/tags/'))",
].join("\n"),
uses: "google-github-actions/auth@v1",
with: {
"project_id": "denoland",
@ -335,7 +328,16 @@ const ci = {
if: "matrix.job == 'bench'",
...installNodeStep,
},
authenticateWithGoogleCloud,
{
if: [
"matrix.profile == 'release' &&",
"matrix.job == 'test' &&",
"github.repository == 'denoland/deno' &&",
"(github.ref == 'refs/heads/main' ||",
"startsWith(github.ref, 'refs/tags/'))",
].join("\n"),
...authenticateWithGoogleCloud,
},
{
name: "Setup gcloud (unix)",
if: [
@ -355,8 +357,8 @@ const ci = {
name: "Setup gcloud (windows)",
if: [
"runner.os == 'Windows' &&",
"matrix.job == 'test' &&",
"matrix.profile == 'release' &&",
"matrix.job == 'test' &&",
"github.repository == 'denoland/deno' &&",
"(github.ref == 'refs/heads/main' ||",
"startsWith(github.ref, 'refs/tags/'))",

View file

@ -127,13 +127,13 @@ jobs:
uses: actions/setup-node@v3
with:
node-version: 18
- name: Authenticate with Google Cloud
if: |-
- if: |-
!(github.event_name == 'pull_request' && matrix.skip_pr) && (steps.exit_early.outputs.EXIT_EARLY != 'true' && (matrix.profile == 'release' &&
matrix.job == 'test' &&
github.repository == 'denoland/deno' &&
(github.ref == 'refs/heads/main' ||
startsWith(github.ref, 'refs/tags/'))))
name: Authenticate with Google Cloud
uses: google-github-actions/auth@v1
with:
project_id: denoland
@ -154,8 +154,8 @@ jobs:
- name: Setup gcloud (windows)
if: |-
!(github.event_name == 'pull_request' && matrix.skip_pr) && (steps.exit_early.outputs.EXIT_EARLY != 'true' && (runner.os == 'Windows' &&
matrix.job == 'test' &&
matrix.profile == 'release' &&
matrix.job == 'test' &&
github.repository == 'denoland/deno' &&
(github.ref == 'refs/heads/main' ||
startsWith(github.ref, 'refs/tags/'))))
@ -552,12 +552,6 @@ jobs:
if: github.repository == 'denoland/deno' && github.ref == 'refs/heads/main'
steps:
- name: Authenticate with Google Cloud
if: |-
matrix.profile == 'release' &&
matrix.job == 'test' &&
github.repository == 'denoland/deno' &&
(github.ref == 'refs/heads/main' ||
startsWith(github.ref, 'refs/tags/'))
uses: google-github-actions/auth@v1
with:
project_id: denoland