From 5df253e085712de8167e24398e50a5545b980ac3 Mon Sep 17 00:00:00 2001 From: Ralph Khreish <35776126+Crunchyman-ralph@users.noreply.github.com> Date: Thu, 7 Aug 2025 15:19:05 +0200 Subject: [PATCH] chore: fix CI checker, improve it --- .changeset/pre.json | 4 ++-- .github/workflows/pre-release.yml | 23 ++++++++++++++++++++--- 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/.changeset/pre.json b/.changeset/pre.json index bb97d44d..54c195f9 100644 --- a/.changeset/pre.json +++ b/.changeset/pre.json @@ -1,5 +1,5 @@ { - "mode": "exit", + "mode": "pre", "tag": "rc", "initialVersions": { "task-master-ai": "0.23.0", @@ -10,4 +10,4 @@ "tender-trams-refuse", "vast-sites-leave" ] -} +} \ No newline at end of file diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml index 16347764..dda73040 100644 --- a/.github/workflows/pre-release.yml +++ b/.github/workflows/pre-release.yml @@ -36,9 +36,26 @@ jobs: - name: Enter RC mode (if not already in RC mode) run: | - # ensure we’re in the right pre-mode (tag "rc") - if [ ! -f .changeset/pre.json ] \ - || [ "$(jq -r '.tag' .changeset/pre.json 2>/dev/null || echo '')" != "rc" ]; then + # Check if we're in pre-release mode with the "rc" tag + if [ -f .changeset/pre.json ]; then + MODE=$(jq -r '.mode' .changeset/pre.json 2>/dev/null || echo '') + TAG=$(jq -r '.tag' .changeset/pre.json 2>/dev/null || echo '') + + if [ "$MODE" = "exit" ]; then + echo "Pre-release mode is in 'exit' state, re-entering RC mode..." + npx changeset pre enter rc + elif [ "$MODE" = "pre" ] && [ "$TAG" != "rc" ]; then + echo "In pre-release mode but with wrong tag ($TAG), switching to RC..." + npx changeset pre exit + npx changeset pre enter rc + elif [ "$MODE" = "pre" ] && [ "$TAG" = "rc" ]; then + echo "Already in RC pre-release mode" + else + echo "Unknown mode state: $MODE, entering RC mode..." + npx changeset pre enter rc + fi + else + echo "No pre.json found, entering RC mode..." npx changeset pre enter rc fi