From 33e9b7a2a0a83c78a093740e62e9184d05c41e7c Mon Sep 17 00:00:00 2001 From: Saadi Myftija Date: Mon, 8 Dec 2025 11:26:08 +0100 Subject: [PATCH 1/3] Allow custom refs when triggering the release workflow manually --- .github/workflows/release.yml | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 300e674e30..6f30865a58 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -15,9 +15,9 @@ on: - release - prerelease default: "prerelease" - prerelease_ref: - description: "The ref (branch, tag, or SHA) to checkout and release from (prerelease only)" - required: false + ref: + description: "The ref (branch, tag, or SHA) to checkout and release from" + required: true type: string prerelease_tag: description: "The npm dist-tag for the prerelease (e.g., 'v4-prerelease')" @@ -53,7 +53,15 @@ jobs: uses: actions/checkout@v4 with: fetch-depth: 0 - ref: main + ref: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.ref || github.sha }} + + - name: Verify ref is on main + if: github.event_name == 'workflow_dispatch' + run: | + if ! git merge-base --is-ancestor ${{ github.event.inputs.ref }} origin/main; then + echo "Error: ref must be an ancestor of main (i.e., already merged)" + exit 1 + fi - name: Setup pnpm uses: pnpm/action-setup@v4 @@ -121,11 +129,11 @@ jobs: uses: actions/checkout@v4 with: fetch-depth: 0 - ref: ${{ github.event.inputs.prerelease_ref }} + ref: ${{ github.event.inputs.ref }} - - name: Validate ref is on main + - name: Verify ref is on main run: | - if ! git merge-base --is-ancestor ${{ github.event.inputs.prerelease_ref }} origin/main; then + if ! git merge-base --is-ancestor ${{ github.event.inputs.ref }} origin/main; then echo "Error: ref must be an ancestor of main (i.e., already merged)" exit 1 fi From fb8b0165667fba9fa8f74f8e119bb6212abd0f45 Mon Sep 17 00:00:00 2001 From: Saadi Myftija Date: Mon, 8 Dec 2025 11:45:33 +0100 Subject: [PATCH 2/3] Show release summary in the GH job output --- .github/workflows/release.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6f30865a58..7ae862d46d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -30,6 +30,21 @@ concurrency: cancel-in-progress: false jobs: + show-release-summary: + name: 📋 Release Summary + runs-on: ubuntu-latest + if: | + github.repository == 'triggerdotdev/trigger.dev' && + github.event_name == 'pull_request' && + github.event.pull_request.merged == true && + github.event.pull_request.head.ref == 'changeset-release/main' + steps: + - name: Show release summary + env: + PR_BODY: ${{ github.event.pull_request.body }} + run: | + echo "$PR_BODY" | sed -n '/^# Releases/,$p' >> $GITHUB_STEP_SUMMARY + release: name: 🚀 Release npm packages runs-on: ubuntu-latest From 676b7e80b0a604dea1af719567ac6b88605ee06c Mon Sep 17 00:00:00 2001 From: Saadi Myftija Date: Tue, 9 Dec 2025 11:24:46 +0100 Subject: [PATCH 3/3] Remove the ref-is-on-main validation from the prerelease job --- .github/workflows/release.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7ae862d46d..684d36dec3 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -146,13 +146,6 @@ jobs: fetch-depth: 0 ref: ${{ github.event.inputs.ref }} - - name: Verify ref is on main - run: | - if ! git merge-base --is-ancestor ${{ github.event.inputs.ref }} origin/main; then - echo "Error: ref must be an ancestor of main (i.e., already merged)" - exit 1 - fi - - name: Setup pnpm uses: pnpm/action-setup@v4 with: