chore(fork): Add the patch-stack infrastructure - #1
Open
krlmlr wants to merge 1 commit into
Open
Conversation
Three files that make this fork maintainable without hand-holding. `.github/pull.yml` lets the Pull app hard-reset `main` from r-lib/cpp11, so `main` is a mirror and nothing else. `.github/workflows/patchstack-sync.yml` rebuilds `fork` -- the default branch -- as `main` plus the squashed stack, nightly and on demand. It takes `b-*` and `f-*` as the stack, so a working branch under another name is left alone. `.github/PATCHSTACK.md` says what the branches are and how to add a patch. It lives under `.github/`, which `.Rbuildignore` already covers. R-CMD-check also runs on `fork` now: the integration is the thing that has to build, and nothing else was checking it.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Patch
a-fork-infraof the stack. This is the one patch that is fork-only and never a candidate for upstream — it sorts first, so it lands first.Three files that make the fork maintainable without hand-holding.
.github/pull.ymllets the Pull app hard-resetmainfromr-lib/cpp11, somainbecomes a 1:1 mirror and nothing else. Nothing may be committed to it after that; the patch branches carry this fork's work..github/workflows/patchstack-sync.ymlrebuildsfork— the default branch — asmainplus the squashed stack, nightly and on demand. It takesb-*andf-*as the stack, so a working branch under another name is left alone. It runs krlmlr/patchstack, which needed two features for this layout: tracking an upstream branch under a different name, and filtering which branches count as patches..github/PATCHSTACK.mdsays what the branches are and how to add a patch. It lives under.github/, which.Rbuildignorealready covers, so it stays out of the built package.R-CMD-check also runs on
forknow. The integration is the thing that actually has to build, and nothing was checking it.Before this can work
Three things outside a merge, in order: flip the repository's default branch to
fork(Pull readspull.ymlfrom the default branch, andmainmust not be the default or Pull would hard-reset the integration away); install the Pull app; and setPATCHSTACK_TOKENto a fine-grained PAT with Contents and Workflows read/write.GITHUB_TOKENmay not push changes to workflow files, andforkcarries these two through this patch — it only bites when their content changes, so later syncs go through on the default token.🤖 Generated with Claude Code
https://claude.ai/code/session_01K8MneV8KqHYUuC8fWV3X5Q
Generated by Claude Code