From 1686a30aa6476453256c1e1c950cd5be7ff9de70 Mon Sep 17 00:00:00 2001 From: Ralph Khreish <35776126+Crunchyman-ralph@users.noreply.github.com> Date: Sun, 3 Aug 2025 15:18:49 +0300 Subject: [PATCH] chore: apply requested changes --- .github/workflows/pre-release.yml | 7 ++++--- .github/workflows/release.yml | 3 +-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml index 6a26ab76..53b9f453 100644 --- a/.github/workflows/pre-release.yml +++ b/.github/workflows/pre-release.yml @@ -9,17 +9,18 @@ on: default: 'next' type: string -concurrency: pre-release-${{ github.ref }} +concurrency: pre-release-${{ inputs.branch || github.ref }} jobs: rc: runs-on: ubuntu-latest # Only allow pre-releases on non-main branches - if: github.ref != 'refs/heads/main' + if: github.ref != 'refs/heads/main' && (!inputs.branch || inputs.branch != 'main') steps: - uses: actions/checkout@v4 with: fetch-depth: 0 + ref: ${{ inputs.branch || github.ref }} - uses: actions/setup-node@v4 with: @@ -66,5 +67,5 @@ jobs: uses: actions-js/push@master with: github_token: ${{ secrets.GITHUB_TOKEN }} - branch: ${{ github.ref }} + branch: ${{ inputs.branch || github.ref }} message: "chore: rc version bump" diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index efb50edf..13d10eb4 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -41,7 +41,6 @@ jobs: - name: Check pre-release mode run: | echo "🔍 Checking pre-release mode status..." - if [ -f .changeset/pre.json ]; then echo "❌ ERROR: Main branch is in pre-release mode!" echo "" @@ -56,7 +55,7 @@ jobs: echo "Then re-run this workflow." exit 1 fi - + echo "✅ Not in pre-release mode - proceeding with release" - name: Create Release Pull Request or Publish to npm