Keep up with upstream: an import script and a daily watch #48

Merged
jcoffey-dev merged 1 commits from feat/upstream-import into main 2026-10-30 22:56:40 +00:00
Owner

Roadmap item 15: keeping up with upstream.

  • scripts/upstream-import.py REF commits an upstream release onto the upstream branch with the rename applied and formatted by rustfmt. The fork's own README, changelog, .gitignore and workflows replace upstream's, and upstream's release tooling is left out. Each snapshot's parent is the last one, so merging upstream into main brings in only upstream's changes, already renamed. --first starts the branch at the commit the fork was made from, and main records it once with git merge -s ours. Tags are fetched into refs/upstream-tags/.
  • .gitea/workflows/upstream-watch.yml runs daily from metadata only. It reads the last import from the upstream branch's head subject and opens an Import upstream vX.Y.Z issue for each newer release.
  • GitHub CI skips the upstream branch.

Tested in a scratch clone:

  • --first 486a384 reproduces the hand rename (#1), except for the added copyright lines and the CLI's about text.
  • Importing v1.0.13 and trial-merging into main leaves 8 conflicting files (29 hunks), all real overlaps such as export, JMAP requests and tests. That merge is the next PR.
  • The watch's release comparison against live data gives v1.0.12 and v1.0.13 after v1.0.11, and nothing after v1.0.13.

The upstream branch doesn't exist on origin yet. It gets pushed with the first import, and until then the watch fails.

Roadmap item 15: keeping up with upstream. - `scripts/upstream-import.py REF` commits an upstream release onto the `upstream` branch with the rename applied and formatted by `rustfmt`. The fork's own README, changelog, `.gitignore` and workflows replace upstream's, and upstream's release tooling is left out. Each snapshot's parent is the last one, so merging `upstream` into main brings in only upstream's changes, already renamed. `--first` starts the branch at the commit the fork was made from, and main records it once with `git merge -s ours`. Tags are fetched into `refs/upstream-tags/`. - `.gitea/workflows/upstream-watch.yml` runs daily from metadata only. It reads the last import from the `upstream` branch's head subject and opens an `Import upstream vX.Y.Z` issue for each newer release. - GitHub CI skips the `upstream` branch. Tested in a scratch clone: - `--first 486a384` reproduces the hand rename (#1), except for the added copyright lines and the CLI's about text. - Importing v1.0.13 and trial-merging into main leaves 8 conflicting files (29 hunks), all real overlaps such as export, JMAP requests and tests. That merge is the next PR. - The watch's release comparison against live data gives v1.0.12 and v1.0.13 after v1.0.11, and nothing after v1.0.13. The `upstream` branch doesn't exist on origin yet. It gets pushed with the first import, and until then the watch fails.
jcoffey-dev added 1 commit 2026-10-30 22:52:01 +00:00
Keep up with upstream: an import script and a daily watch
ci / test (pull_request) Skipped
github/ci (branch) GitHub Actions
ci / github (pull_request) Successful in 4m31s
ci / announce (pull_request) Skipped
c570a91ad5
scripts/upstream-import.py commits an upstream release onto the
`upstream` branch with the fork's rename applied (rustfmt'd), the fork's
own README, changelog, .gitignore and workflows in place of upstream's, and
upstream's release tooling left out. Each snapshot's parent is the last, so
merging the branch into main brings in only what upstream changed, already
renamed. Upstream tags go to refs/upstream-tags/, never refs/tags/.

The upstream-watch workflow reads the imported release from the branch's
head subject and opens an "Import upstream vX.Y.Z" issue for each newer
release, daily, from metadata only. GitHub's CI skips the `upstream`
branch.
jcoffey-dev merged commit f50d7fb96c into main 2026-10-30 22:56:40 +00:00
jcoffey-dev deleted branch feat/upstream-import 2026-10-30 22:56:41 +00:00
Sign in to join this conversation.