From 93b676ddee1e114dab308b9e0bc9e734411aeb75 Mon Sep 17 00:00:00 2001 From: Jake Bailey <5341706+jakebailey@users.noreply.github.com> Date: Wed, 22 May 2024 13:09:56 -0700 Subject: [PATCH] Fix preview site getting cancelled, deploying on closed PRs --- .github/workflows/close-preview.yml | 3 --- .github/workflows/deploy-preview.yml | 8 +++++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/close-preview.yml b/.github/workflows/close-preview.yml index 2551f50382b2..a8a6503f2f4f 100644 --- a/.github/workflows/close-preview.yml +++ b/.github/workflows/close-preview.yml @@ -9,9 +9,6 @@ on: pull_request_target: types: [closed] -concurrency: - group: preview-site - jobs: close: runs-on: ubuntu-latest diff --git a/.github/workflows/deploy-preview.yml b/.github/workflows/deploy-preview.yml index 22b12ca01289..b87fd2355e36 100644 --- a/.github/workflows/deploy-preview.yml +++ b/.github/workflows/deploy-preview.yml @@ -17,9 +17,6 @@ permissions: pull-requests: write actions: read -concurrency: - group: preview-site - jobs: deploy: if: github.event_name != 'workflow_run' || github.event.workflow_run.conclusion == 'success' @@ -79,6 +76,11 @@ jobs: console.log(`Found PR ${pr.html_url}`); console.log(pr); + if (pr.state !== "open") { + console.log(`PR ${pr.number} is not open`); + return null; + } + if (!pr.labels.some((label) => label.name === "deploy-preview")) { console.log(`PR ${pr.number} does not have the deploy-preview label`); return null;