Skip to content

fix: Restore release PR auto-merge #12927

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
anthonyshew merged 2 commits into from
May 22, 2026
Merged

fix: Restore release PR auto-merge #12927

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1b2c4ab
fix: Restore release PR auto-merge
anthonyshew May 22, 2026
c1672b1
fix: Harden release PR detection
anthonyshew May 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 17 additions & 7 deletions .github/actions/check-release-pr/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
name: Check Release PR
description: |
Detects automated release PRs created by github-actions[bot] with title
matching "release(turborepo):*". These PRs only contain version bumps and
can skip full test suites.
matching "release(turborepo):*". These PRs only contain generated release
updates and can skip full test suites.

This action also validates that release PRs only modify expected files
(version.txt, package.json, Cargo.toml, Cargo.lock, CHANGELOG).
(version.txt, package.json, Cargo.toml, Cargo.lock, CHANGELOG,
pnpm-lock.yaml, and generated Turborepo skill files).

outputs:
is-release-pr:
Expand All @@ -22,6 +23,9 @@ runs:
EVENT_NAME: ${{ github.event_name }}
PR_AUTHOR: ${{ github.event.pull_request.user.login }}
PR_TITLE: ${{ github.event.pull_request.title }}
PR_HEAD_REF: ${{ github.event.pull_request.head.ref }}
PR_HEAD_REPO: ${{ github.event.pull_request.head.repo.full_name }}
REPOSITORY: ${{ github.repository }}
PR_BASE_SHA: ${{ github.event.pull_request.base.sha }}
PR_HEAD_SHA: ${{ github.event.pull_request.head.sha }}
run: |
Expand All @@ -34,6 +38,12 @@ runs:

# Check if PR is from github-actions[bot] with release title
if [[ "$PR_AUTHOR" == "github-actions[bot]" && "$PR_TITLE" =~ ^release\(turborepo\): ]]; then
if [[ "$PR_HEAD_REPO" != "$REPOSITORY" || ! "$PR_HEAD_REF" =~ ^staging-[0-9]+\.[0-9]+\.[0-9]+(-[a-zA-Z0-9.]+)?$ ]]; then
echo "is-release-pr=false" >> $GITHUB_OUTPUT
echo "Not a release PR branch (head: $PR_HEAD_REPO:$PR_HEAD_REF)"
exit 0
fi

echo "Detected automated release PR from $PR_AUTHOR"
echo "Title: $PR_TITLE"
echo "is-release-pr=true" >> $GITHUB_OUTPUT
Expand All @@ -58,7 +68,7 @@ runs:
echo "$CHANGED_FILES"

# Validate each file matches expected release patterns
ALLOWED_PATTERN="^(version\.txt|.*/package\.json|package\.json|Cargo\.toml|Cargo\.lock|.*/Cargo\.toml|CHANGELOG.*|pnpm-lock\.yaml)$"
ALLOWED_PATTERN="^(version\.txt|.*/package\.json|package\.json|Cargo\.toml|Cargo\.lock|.*/Cargo\.toml|CHANGELOG.*|pnpm-lock\.yaml|skills/turborepo/SKILL\.md|skills/turborepo/references/best-practices/structure\.md|skills/turborepo/references/configuration/RULE\.md|skills/turborepo/references/environment/RULE\.md|skills/turborepo/references/environment/gotchas\.md)$"

INVALID_FILES=""
while IFS= read -r file; do
Expand All @@ -68,10 +78,10 @@ runs:
done <<< "$CHANGED_FILES"

if [[ -n "$INVALID_FILES" ]]; then
echo "::error::Release PR contains unexpected files that are not version-related:"
echo "::error::Release PR contains unexpected files that are not generated release updates:"
echo "$INVALID_FILES"
echo "::error::Release PRs should only modify version.txt, package.json, Cargo.toml, Cargo.lock, CHANGELOG, or pnpm-lock.yaml"
echo "::error::Release PRs should only modify version.txt, package.json, Cargo.toml, Cargo.lock, CHANGELOG, pnpm-lock.yaml, or generated Turborepo skill files"
exit 1
fi

echo "Release PR content validation passed - only version-related files changed"
echo "Release PR content validation passed - only generated release files changed"
16 changes: 12 additions & 4 deletions .github/workflows/test-js-packages.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ jobs:
PR_AUTHOR: ${{ github.event.pull_request.user.login }}
PR_TITLE: ${{ github.event.pull_request.title }}
PR_NUMBER: ${{ github.event.pull_request.number }}
PR_HEAD_REF: ${{ github.event.pull_request.head.ref }}
PR_HEAD_REPO: ${{ github.event.pull_request.head.repo.full_name }}
REPOSITORY: ${{ github.repository }}
GH_TOKEN: ${{ github.token }}
run: |
Expand All @@ -45,6 +47,12 @@ jobs:
exit 0
fi

if [[ "$PR_HEAD_REPO" != "$REPOSITORY" || ! "$PR_HEAD_REF" =~ ^staging-[0-9]+\.[0-9]+\.[0-9]+(-[a-zA-Z0-9.]+)?$ ]]; then
echo "is-release-pr=false" >> "$GITHUB_OUTPUT"
echo "Not a release PR branch (head: $PR_HEAD_REPO:$PR_HEAD_REF)"
exit 0
fi

CHANGED_FILES=$(gh api --paginate "repos/${REPOSITORY}/pulls/${PR_NUMBER}/files" --jq '.[].filename')
if [[ -z "$CHANGED_FILES" ]]; then
echo "::error::Unable to determine changed files for release PR"
Expand All @@ -54,7 +62,7 @@ jobs:
echo "Changed files in release PR:"
printf '%s\n' "$CHANGED_FILES"

ALLOWED_PATTERN="^(version\.txt|.*/package\.json|package\.json|Cargo\.toml|Cargo\.lock|.*/Cargo\.toml|CHANGELOG.*|pnpm-lock\.yaml)$"
ALLOWED_PATTERN="^(version\.txt|.*/package\.json|package\.json|Cargo\.toml|Cargo\.lock|.*/Cargo\.toml|CHANGELOG.*|pnpm-lock\.yaml|skills/turborepo/SKILL\.md|skills/turborepo/references/best-practices/structure\.md|skills/turborepo/references/configuration/RULE\.md|skills/turborepo/references/environment/RULE\.md|skills/turborepo/references/environment/gotchas\.md)$"
INVALID_FILES=""
while IFS= read -r file; do
if [[ -n "$file" && ! "$file" =~ $ALLOWED_PATTERN ]]; then
Expand All @@ -63,14 +71,14 @@ jobs:
done <<< "$CHANGED_FILES"

if [[ -n "$INVALID_FILES" ]]; then
echo "::error::Release PR contains unexpected files that are not version-related:"
echo "::error::Release PR contains unexpected files that are not generated release updates:"
printf '%s\n' "$INVALID_FILES"
echo "::error::Release PRs should only modify version.txt, package.json, Cargo.toml, Cargo.lock, CHANGELOG, or pnpm-lock.yaml"
echo "::error::Release PRs should only modify version.txt, package.json, Cargo.toml, Cargo.lock, CHANGELOG, pnpm-lock.yaml, or generated Turborepo skill files"
exit 1
fi

echo "is-release-pr=true" >> "$GITHUB_OUTPUT"
echo "Release PR content validation passed - only version-related files changed"
echo "Release PR content validation passed - only generated release files changed"

- name: Checkout
if: steps.check.outputs.is-release-pr != 'true'
Expand Down
20 changes: 14 additions & 6 deletions .github/workflows/turborepo-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ jobs:
rust: ${{ steps.filter.outputs.rust }}
native-lib: ${{ steps.filter.outputs.native-lib }}
steps:
# Detect automated release PRs which only contain version bumps.
# Detect automated release PRs which only contain generated release updates.
# These PRs are created by the release workflow after code has already
# been tested on main. Skipping tests on version-only changes saves CI time.
# been tested on main. Skipping tests on generated release lets us auto-merge release PRs.
- name: Check if automated release PR
id: check-release
shell: bash
Expand All @@ -37,6 +37,8 @@ jobs:
PR_AUTHOR: ${{ github.event.pull_request.user.login }}
PR_TITLE: ${{ github.event.pull_request.title }}
PR_NUMBER: ${{ github.event.pull_request.number }}
PR_HEAD_REF: ${{ github.event.pull_request.head.ref }}
PR_HEAD_REPO: ${{ github.event.pull_request.head.repo.full_name }}
REPOSITORY: ${{ github.repository }}
GH_TOKEN: ${{ github.token }}
run: |
Expand All @@ -54,6 +56,12 @@ jobs:
exit 0
fi

if [[ "$PR_HEAD_REPO" != "$REPOSITORY" || ! "$PR_HEAD_REF" =~ ^staging-[0-9]+\.[0-9]+\.[0-9]+(-[a-zA-Z0-9.]+)?$ ]]; then
echo "is-release-pr=false" >> "$GITHUB_OUTPUT"
echo "Not a release PR branch (head: $PR_HEAD_REPO:$PR_HEAD_REF)"
exit 0
fi

CHANGED_FILES=$(gh api --paginate "repos/${REPOSITORY}/pulls/${PR_NUMBER}/files" --jq '.[].filename')
if [[ -z "$CHANGED_FILES" ]]; then
echo "::error::Unable to determine changed files for release PR"
Expand All @@ -63,7 +71,7 @@ jobs:
echo "Changed files in release PR:"
printf '%s\n' "$CHANGED_FILES"

ALLOWED_PATTERN="^(version\.txt|.*/package\.json|package\.json|Cargo\.toml|Cargo\.lock|.*/Cargo\.toml|CHANGELOG.*|pnpm-lock\.yaml)$"
ALLOWED_PATTERN="^(version\.txt|.*/package\.json|package\.json|Cargo\.toml|Cargo\.lock|.*/Cargo\.toml|CHANGELOG.*|pnpm-lock\.yaml|skills/turborepo/SKILL\.md|skills/turborepo/references/best-practices/structure\.md|skills/turborepo/references/configuration/RULE\.md|skills/turborepo/references/environment/RULE\.md|skills/turborepo/references/environment/gotchas\.md)$"
INVALID_FILES=""
while IFS= read -r file; do
if [[ -n "$file" && ! "$file" =~ $ALLOWED_PATTERN ]]; then
Expand All @@ -72,14 +80,14 @@ jobs:
done <<< "$CHANGED_FILES"

if [[ -n "$INVALID_FILES" ]]; then
echo "::error::Release PR contains unexpected files that are not version-related:"
echo "::error::Release PR contains unexpected files that are not generated release updates:"
printf '%s\n' "$INVALID_FILES"
echo "::error::Release PRs should only modify version.txt, package.json, Cargo.toml, Cargo.lock, CHANGELOG, or pnpm-lock.yaml"
echo "::error::Release PRs should only modify version.txt, package.json, Cargo.toml, Cargo.lock, CHANGELOG, pnpm-lock.yaml, or generated Turborepo skill files"
exit 1
fi

echo "is-release-pr=true" >> "$GITHUB_OUTPUT"
echo "Release PR content validation passed - only version-related files changed"
echo "Release PR content validation passed - only generated release files changed"

- name: Checkout
if: steps.check-release.outputs.is-release-pr != 'true'
Expand Down
Loading