[PR #8958] [CLOSED] chore: sync main to next #16572

Closed
opened 2026-04-13 10:35:09 -05:00 by GiteaMirror · 0 comments
Owner

📋 Pull Request Information

Original PR: https://github.com/better-auth/better-auth/pull/8958
Author: @better-release[bot]
Created: 4/4/2026
Status: Closed

Base: nextHead: main


📝 Commits (5)

  • b79c045 fix(ci): replace rebase sync with batched merge PR, add auto-retarget (#8957)
  • 4bb24cf fix(ci): exclude promotion PRs from auto-retarget (#8960)
  • 126e92a ci: add auto-changeset generation on PR approval (#8959)
  • 982b505 refactor(ci): drop c-* label prefix, delete pr-analyzer, simplify auto-label (#8963)
  • 7b65767 fix(ci): run tests in merge queue, add summary gate jobs, cover next branch (#8964)

📊 Changes

15 files changed (+630 additions, -357 deletions)

View changed files

📝 .cspell/tech-terms.txt (+6 -0)
📝 .github/labeler.yml (+15 -15)
.github/scripts/auto-changeset.ts (+276 -0)
.github/scripts/pr-analyzer.ts (+0 -245)
.github/workflows/auto-changeset.yml (+192 -0)
📝 .github/workflows/auto-label.yml (+0 -19)
.github/workflows/auto-retarget.yml (+75 -0)
📝 .github/workflows/ci.yml (+9 -12)
📝 .github/workflows/e2e.yml (+10 -26)
📝 .github/workflows/promote.yml (+14 -6)
📝 .github/workflows/release.yml (+26 -30)
📝 .github/workflows/verify-changesets.yml (+2 -2)
📝 .github/workflows/zizmor.yml (+1 -1)
📝 .github/zizmor.yml (+3 -0)
📝 knip.jsonc (+1 -1)

📄 Description

Brings stable fixes from main into the next branch.

This PR must be merged by a maintainer using 'Create a merge commit' (not squash, not rebase). This preserves individual fix commits and their verified signatures.

If there are conflicts, resolve them by keeping next's versions for package.json files (next is always ahead of main in version numbers).


Summary by cubic

Syncs stable fixes from main into next. Adds auto-changeset/auto-retarget, switches branch sync to a merge-PR flow, simplifies labels, and tightens CI (runs tests in merge queue, adds summary gate jobs, and covers next).

  • New Features

    • auto-changeset: Maintainers can comment /changeset to get a suggested .changeset/pr-{N}.md. Runs from the base branch, respects patch-only rules on main/release/*, and skips if packages aren’t touched or a manual changeset exists.
    • auto-retarget: PRs to main with minor/major changesets are moved to next, labeled retargeted-to-next, and explained via comment (skips promotion PRs and changeset-release branches).
  • Refactors

    • Replaces rebase sync in release.yml with an automated “sync main to next” PR; detects existing PRs, flags conflicts, and requires “Create a merge commit”. If conflicts occur, keep next’s package.json versions.
    • Simplifies labels: drops c-* prefixes to plain labels (core, database, etc.), deletes pr-analyzer.ts, and removes cross-cutting refinement from auto-label.yml.
    • Improves promote.yml reliability and copy; enforces merge-commit for promotion (admin bypass) and adds post-promotion guidance in the summary.
    • CI updates: runs tests in merge queue and adds summary gate jobs to aggregate status; extends E2E and zizmor to watch next; clearer verify-changesets.yml errors pointing to auto-retarget; adds terms to cspell; updates zizmor allowlist; adds tsx to knip ignore.

Written for commit 7b65767628. Summary will update on new commits.


🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/better-auth/better-auth/pull/8958 **Author:** [@better-release[bot]](https://github.com/apps/better-release) **Created:** 4/4/2026 **Status:** ❌ Closed **Base:** `next` ← **Head:** `main` --- ### 📝 Commits (5) - [`b79c045`](https://github.com/better-auth/better-auth/commit/b79c0459275f2cb25d26c151cb09c2e3af4e8fa8) fix(ci): replace rebase sync with batched merge PR, add auto-retarget (#8957) - [`4bb24cf`](https://github.com/better-auth/better-auth/commit/4bb24cfd75ae22816ab0459dfc7d062aa2c6ac40) fix(ci): exclude promotion PRs from auto-retarget (#8960) - [`126e92a`](https://github.com/better-auth/better-auth/commit/126e92ab243aba059aeda666f25bbd345b857968) ci: add auto-changeset generation on PR approval (#8959) - [`982b505`](https://github.com/better-auth/better-auth/commit/982b5050996c4f2ea67c477d26019947637ed059) refactor(ci): drop `c-*` label prefix, delete pr-analyzer, simplify auto-label (#8963) - [`7b65767`](https://github.com/better-auth/better-auth/commit/7b6576762882f7a5e6361b63ea794556e487d197) fix(ci): run tests in merge queue, add summary gate jobs, cover next branch (#8964) ### 📊 Changes **15 files changed** (+630 additions, -357 deletions) <details> <summary>View changed files</summary> 📝 `.cspell/tech-terms.txt` (+6 -0) 📝 `.github/labeler.yml` (+15 -15) ➕ `.github/scripts/auto-changeset.ts` (+276 -0) ➖ `.github/scripts/pr-analyzer.ts` (+0 -245) ➕ `.github/workflows/auto-changeset.yml` (+192 -0) 📝 `.github/workflows/auto-label.yml` (+0 -19) ➕ `.github/workflows/auto-retarget.yml` (+75 -0) 📝 `.github/workflows/ci.yml` (+9 -12) 📝 `.github/workflows/e2e.yml` (+10 -26) 📝 `.github/workflows/promote.yml` (+14 -6) 📝 `.github/workflows/release.yml` (+26 -30) 📝 `.github/workflows/verify-changesets.yml` (+2 -2) 📝 `.github/workflows/zizmor.yml` (+1 -1) 📝 `.github/zizmor.yml` (+3 -0) 📝 `knip.jsonc` (+1 -1) </details> ### 📄 Description Brings stable fixes from main into the next branch. **This PR must be merged by a maintainer using 'Create a merge commit'** (not squash, not rebase). This preserves individual fix commits and their verified signatures. If there are conflicts, resolve them by keeping next's versions for `package.json` files (next is always ahead of main in version numbers). <!-- This is an auto-generated description by cubic. --> --- ## Summary by cubic Syncs stable fixes from `main` into `next`. Adds `auto-changeset`/`auto-retarget`, switches branch sync to a merge-PR flow, simplifies labels, and tightens CI (runs tests in merge queue, adds summary gate jobs, and covers `next`). - **New Features** - `auto-changeset`: Maintainers can comment `/changeset` to get a suggested `.changeset/pr-{N}.md`. Runs from the base branch, respects patch-only rules on `main`/`release/*`, and skips if packages aren’t touched or a manual changeset exists. - `auto-retarget`: PRs to `main` with minor/major changesets are moved to `next`, labeled `retargeted-to-next`, and explained via comment (skips promotion PRs and changeset-release branches). - **Refactors** - Replaces rebase sync in `release.yml` with an automated “sync main to next” PR; detects existing PRs, flags conflicts, and requires “Create a merge commit”. If conflicts occur, keep `next`’s `package.json` versions. - Simplifies labels: drops `c-*` prefixes to plain labels (`core`, `database`, etc.), deletes `pr-analyzer.ts`, and removes cross-cutting refinement from `auto-label.yml`. - Improves `promote.yml` reliability and copy; enforces merge-commit for promotion (admin bypass) and adds post-promotion guidance in the summary. - CI updates: runs tests in merge queue and adds summary gate jobs to aggregate status; extends E2E and `zizmor` to watch `next`; clearer `verify-changesets.yml` errors pointing to auto-retarget; adds terms to `cspell`; updates `zizmor` allowlist; adds `tsx` to `knip` ignore. <sup>Written for commit 7b6576762882f7a5e6361b63ea794556e487d197. Summary will update on new commits.</sup> <!-- End of auto-generated description by cubic. --> --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
GiteaMirror added the pull-request label 2026-04-13 10:35:09 -05:00
Sign in to join this conversation.
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: github-starred/better-auth#16572