From 523a4719fa2d88df79453e93a01235c1c54e7d59 Mon Sep 17 00:00:00 2001 From: Gauthier Petetin Date: Tue, 25 Jul 2023 16:46:18 -0300 Subject: [PATCH] fix(action): increase list of labels which prevent merges --- .github/scripts/check-pr-has-required-labels.ts | 2 +- .github/workflows/ci-all-branches.yml | 17 ----------------- 2 files changed, 1 insertion(+), 18 deletions(-) delete mode 100644 .github/workflows/ci-all-branches.yml diff --git a/.github/scripts/check-pr-has-required-labels.ts b/.github/scripts/check-pr-has-required-labels.ts index 3fff58a5cd2f..7e9ec3573efa 100644 --- a/.github/scripts/check-pr-has-required-labels.ts +++ b/.github/scripts/check-pr-has-required-labels.ts @@ -30,7 +30,7 @@ async function main(): Promise { // Retrieve pull request labels const prLabels = await retrievePullRequestLabels(octokit, prRepoOwner, prRepoName, prNumber); - const preventMergeLabels = ["needs-qa", "QA'd but questions", "issues-found"]; + const preventMergeLabels = ["needs-qa", "QA'd but questions", "issues-found", "need-ux-ds-review", "blocked", "stale", "DO-NOT-MERGE"]; let hasTeamLabel = false; diff --git a/.github/workflows/ci-all-branches.yml b/.github/workflows/ci-all-branches.yml deleted file mode 100644 index 5592bfa7e84c..000000000000 --- a/.github/workflows/ci-all-branches.yml +++ /dev/null @@ -1,17 +0,0 @@ -# Fails the pull request if it has the "DO-NOT-MERGE" label - -name: ci / check all branches - -on: - pull_request: - types: [opened, reopened, labeled, unlabeled, synchronize] - -jobs: - do-not-merge: - runs-on: ubuntu-latest - if: ${{ contains(github.event.pull_request.labels.*.name, 'DONOTMERGE') }} - steps: - - name: 'Check for label "DONOTMERGE"' - run: | - echo 'This check fails PRs with the "DONOTMERGE" label to block merging' - exit 1