Carry private-preview's CI workflow branch list on master - #1897
Merged
Conversation
private-preview's ci.yml differs from master's by one additive hunk: `private-preview` in `on.push.branches`. Because that hunk lives only on private-preview, every merge of master into private-preview yields a workflow blob matching neither parent. GitHub refuses a push from a GitHub App lacking `workflows` permission when it introduces a workflow blob that does not already exist in the repository, so the sdk-codegen Codegen job's push to latest-codegen-private-preview is rejected and a human has to perform the merge by hand. Holding the hunk on master too means both sides of the merge carry the same change, the merge result is byte-identical to master's blob, and the App only ever carries an already-committed file forward. The hunk is a no-op on master. For a push event the workflow file comes from the pushed ref, so master's copy listing private-preview is never consulted for a push to private-preview, and it cannot affect pushes to master or beta. `on.pull_request.branches` already lists private-preview. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> Committed-By-Agent: claude
jar-stripe
marked this pull request as ready for review
August 28, 2026 19:55
jar-stripe
requested review from
zacchua-stripe
and removed request for
a team
August 28, 2026 19:55
zacchua-stripe
approved these changes
Aug 28, 2026
xavdid
approved these changes
Aug 28, 2026
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
3 participants
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.
Why?
Our codegen GitHub Actions job's push to latest-codegen-private-preview is rejected by GitHub: the master→private-preview merge produces a
ci.ymlthat exists nowhere in the repository, and the App performing the push has no workflows permission. GitHub allows changes to workflow files that are carried forward in merged commits, so this PR adds in any lines that were exclusive to the private preview branch's workflow file to ensure a merge with no additional workflow file changes.What?
private-previewtoon.push.branchesSee Also