From faf7bd218e082269d3918f83b827b83b8462ac66 Mon Sep 17 00:00:00 2001 From: Jeff Yates Date: Fri, 20 Dec 2024 16:56:11 -0600 Subject: [PATCH] [fei6062.3.releasing] Catch the RELEASING commit issueprotections (#2417) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## Summary: For some reason, merging Version Packages didn't do a squash merge and that meant we got the change Issue: FEI-6062 ## Test plan: Author: somewhatabstract Reviewers: somewhatabstract, jandrade Required Reviewers: Approved By: jandrade Checks: ✅ Chromatic - Get results on regular PRs (ubuntu-latest, 20.x), ✅ Test / Test (ubuntu-latest, 20.x, 2/2), ✅ Test / Test (ubuntu-latest, 20.x, 1/2), ✅ Lint / Lint (ubuntu-latest, 20.x), ✅ Check build sizes (ubuntu-latest, 20.x), ✅ Publish npm snapshot (ubuntu-latest, 20.x), ✅ Chromatic - Build on regular PRs / chromatic (ubuntu-latest, 20.x), ✅ Check for .changeset entries for all changed files (ubuntu-latest, 20.x), ⏭️ Chromatic - Skip on Release PR (changesets), ✅ Prime node_modules cache for primary configuration (ubuntu-latest, 20.x), ⏭️ dependabot, ✅ gerald Pull Request URL: https://github.com/Khan/wonder-blocks/pull/2417 --- .changeset/ten-pandas-decide.md | 5 +++++ .github/workflows/node-ci-pr.yml | 3 +-- 2 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 .changeset/ten-pandas-decide.md diff --git a/.changeset/ten-pandas-decide.md b/.changeset/ten-pandas-decide.md new file mode 100644 index 000000000..3e779c43b --- /dev/null +++ b/.changeset/ten-pandas-decide.md @@ -0,0 +1,5 @@ +--- +"@khanacademy/wonder-blocks-data": patch +--- + +Version bump to verify release protections diff --git a/.github/workflows/node-ci-pr.yml b/.github/workflows/node-ci-pr.yml index acd8fdcab..cbc1a17fe 100644 --- a/.github/workflows/node-ci-pr.yml +++ b/.github/workflows/node-ci-pr.yml @@ -147,7 +147,6 @@ jobs: id: get-run-url run: echo "run_url=https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}" >> $GITHUB_OUTPUT - # We need to see if any releases are in progress. # We do not want to try and publish anything if a publish is # pending. We fail here, but we make sure to update the @@ -160,7 +159,7 @@ jobs: # Releases are triggered by merging "Version Packages" PRs. # So we look for instances of the release.yml workflow, with # a title containing "Version Packages", that are in progress. - release_count=$(gh run list --workflow release.yml --json status,displayTitle --jq '[.[] | select(.status == "in_progress" and (.displayTitle | contains("Version Packages")))] | length') + release_count=$(gh run list --workflow release.yml --json status,displayTitle --jq '[.[] | select(.status == "in_progress" and ((.displayTitle | contains("Version Packages")) or (.displayTitle | contains("RELEASING:"))))] | length') echo "release_count=$release_count" >> $GITHUB_OUTPUT if [ "$release_count" -ne 0 ]; then echo "Error: There are $release_count releases in progress."