ci: rebase check in merge-pr script #28250
Closed
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
IgorMinar
added
state: WIP
area: build & ci
IgorMinar
force-pushed
the
ci/rebase-check-in-merge-script
branch
2 times, most recently
from
da32f42 to
4c3df08
Compare
Adds a check to verify that each PR branch to be merged upstream contains SHAs of commits that significantly changed our CI infrastructure. This check is used to enforce that we don't merge PRs that have not been rebased recently and could result in merging of non-approved or otherwise bad changes.
IgorMinar
force-pushed
the
ci/rebase-check-in-merge-script
branch
from
9fb3c2e to
40c4463
Compare
IgorMinar
changed the title
IgorMinar
added
action: review
|
I manually verified that the script does the right thing in all the common scenarios. |
IgorMinar
added
action: merge
alxhub
approved these changes
Jan 22, 2019
| # | ||
| # This check is used to enforce that we don't merge PRs that have not been rebased recently and could result in merging | ||
| # of non-approved or otherwise bad changes. | ||
| REQUIRED_BASE_SHA_MASTER="3fba6eff79a9b50909199eaa4ebf754c1c4adba6" # pullapprove => CODEOWNERS migration |
There was a problem hiding this comment.
Alternatively, we could have these as upstream branch pointers (or tags), which wouldn't require a commit in order to change.
There was a problem hiding this comment.
the thing I like about this approach is that we have an audit trail. tags don't require PRs or approvals, unless we go with "annotated tags" which might do the trick, I'm just not that familiar with them
alxhub
pushed a commit
that referenced
this pull request
Jan 22, 2019
Adds a check to verify that each PR branch to be merged upstream contains SHAs of commits that significantly changed our CI infrastructure. This check is used to enforce that we don't merge PRs that have not been rebased recently and could result in merging of non-approved or otherwise bad changes. PR Close #28250
ngfelixl
pushed a commit
to ngfelixl/angular
that referenced
this pull request
Jan 28, 2019
Adds a check to verify that each PR branch to be merged upstream contains SHAs of commits that significantly changed our CI infrastructure. This check is used to enforce that we don't merge PRs that have not been rebased recently and could result in merging of non-approved or otherwise bad changes. PR Close angular#28250
vetom
pushed a commit
to vetom/angular
that referenced
this pull request
Jan 31, 2019
Adds a check to verify that each PR branch to be merged upstream contains SHAs of commits that significantly changed our CI infrastructure. This check is used to enforce that we don't merge PRs that have not been rebased recently and could result in merging of non-approved or otherwise bad changes. PR Close angular#28250
|
This issue has been automatically locked due to inactivity. Read more about our automatic conversation locking policy. This action has been performed automatically by a bot. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Adds a check to verify that each PR branch to be merged upstream contains SHAs of commits that significantly changed our CI infrastructure.
This check is used to enforce that we don't merge PRs that have not been rebased recently and could result in merging of non-approved or otherwise bad changes.