fix(CI): don't PR against "next" if we can't cleanly cherry pick #6703
Conversation
This file contains 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
jtoar
changed the title
jtoar
changed the title
jtoar
added a commit
that referenced
this pull request
Oct 14, 2022
dac09
added a commit
that referenced
this pull request
Oct 26, 2022
…aching * 'main' of github.com:redwoodjs/redwood: (244 commits) chore(deps): update dependency @replayio/playwright to v0.3.0 (#6735) chore: update all contributors Update Clerk docs (#6712) Update firebase auth docs (#6717) Clerk: Simplify web implementation (#6713) Add auth decoder to clerk auth setup (#6718) Auth: Update firebase setup script (#6716) chore: Remove redundant space " " (#6714) Update the Clerk setup script and templates (#6710) Fix decouple auth related type errors (#6709) fix(deps): update dependency css-minimizer-webpack-plugin to v4.2.2 (#6688) fix(deps): update dependency @graphql-codegen/cli to v2.13.7 (#6687) feat: publish 2nd canary (@next) from release branch (#6505) fix: don't pr if can't cherry pick cleanly (#6703) fix(dbAuth): add required packages to setup command (#6698) Netlify: Enable auth-providers-api and auth-providers-web installation (#6697) chore: make misc change to trigger canary publishing (#6695) chore: remove private on new packages (#6692) chore: run lint fix (#6691) Decouple auth (#5985) ...
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fixes what we saw happen in https://github.com/redwoodjs/redwood/actions/runs/3245650941. In this run, even though the fast-forward job couldn't cleanly cherry pick the commit in the squashed PR, the PR step could (somehow), and went ahead and made a PR. Let's just exit if the first step fails.
This PR also adds a
skip-cherry-pickflag for PRs that will cleanly cherry pick but that we don't want in the next, like those in the last few commits.