Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[repo] protected branch: remove requirement for PRs to be up to date with master #415

Open
blueyed opened this issue Oct 17, 2017 · 10 comments

Comments

@blueyed
Copy link
Contributor

blueyed commented Oct 17, 2017

@paltman
It makes sense when transitioning to a new build system, but by now I think you should rather update all older PRs, and then we can disable it - in the end it only requires to update all PRs once one has been merged.

@blueyed blueyed changed the title admin: remove requirement for PRs to be up to date with master [repo] remove requirement for PRs to be up to date with master Oct 17, 2017
@blueyed
Copy link
Contributor Author

blueyed commented Oct 18, 2017

CircleCI does not test the merge commit after all currently.. :/

See https://discuss.circleci.com/t/show-test-results-for-prospective-merge-of-a-github-pr/1662/

@blueyed
Copy link
Contributor Author

blueyed commented Oct 23, 2017

@paltman
While at it, please also remove the removed py35djmaster and py36djmaster jobs from being successful.

@blueyed blueyed changed the title [repo] remove requirement for PRs to be up to date with master [repo] protected branch: remove requirement for PRs to be up to date with master Oct 23, 2017
@paltman paltman added this to the Samwise milestone Oct 25, 2017
@paltman
Copy link
Member

paltman commented Oct 25, 2017

I believe this is complete.

@paltman
Copy link
Member

paltman commented Oct 25, 2017

Well, at least the py35djmaster and py36djmaster are no longer checked. Was there something else?

@blueyed
Copy link
Contributor Author

blueyed commented Oct 25, 2017

I think the "Update branch" button indicates that the branch has to be up-to-date with master still?

Otherwise there is #422 (in a separate issue).

@paltman
Copy link
Member

paltman commented Oct 30, 2017

#422 is merged. Can this be closed?

@blueyed
Copy link
Contributor Author

blueyed commented Oct 30, 2017

The main issue is still there:

I think the "Update branch" button indicates that the branch has to be up-to-date with master still?

@paltman
Copy link
Member

paltman commented Oct 30, 2017

Are you talking about the "update branch" on Github PRs? I'm confused.

@paltman
Copy link
Member

paltman commented Oct 30, 2017

Oh, I see now. I mostly override it if there are no conflicts. Why does it really matter one way or another?

@paltman
Copy link
Member

paltman commented Oct 30, 2017

Also, in my experience, CircleCI is, in fact, rerunning after I update the branch from master.

@paltman paltman modified the milestones: Samwise, Rosie Oct 30, 2017
@paltman paltman modified the milestones: Rosie, December 2017 Sprint Dec 1, 2017
@paltman paltman removed this from the December 2017 Sprint milestone Nov 25, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

2 participants