Fix Circle merge on master branch. #20709
Merged
Conversation
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
There exists a PR on a random fork, which fills in `CI_PULL_REQUEST`, which we don't want to use as merge target when building `master`. Instead, check `CIRCLE_PR_NUMBER`, which is set only on forked PRs. Also, check branch name (which is current, not the _target_) to be certain.
|
We should wait for circle to finish and then merge. We won't see if this actually fixed the problem until it lands on master. |
tacaswell
approved these changes
Jul 21, 2021
Wow, I've never seen that crop up before! Your solution sounds reasonable to me |
|
Let's try this. |
|
ooops; sorry @timhoffm your message came in as I hit the Merge button |
|
GitHub is not thread-safe. 🤣 |
|
It was successful, I believe: this PR merged while master didn't. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 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.
PR Summary
There exists a PR on a random fork, which fills in
CI_PULL_REQUEST, which we don't want to use as merge target when buildingmaster. Instead, checkCIRCLE_PR_NUMBER, which is set only on forked PRs. Also, check branch name (which is current, not the target) to be certain.Followup to #20680, @larsoner
PR Checklist
pytestpasses).flake8on changed files to check).flake8-docstringsand runflake8 --docstring-convention=all).doc/users/next_whats_new/(follow instructions in README.rst there).doc/api/next_api_changes/(follow instructions in README.rst there).