Merge before test #55
Open
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
ant31
force-pushed
the
rebase-before-test
branch
from
5e84c64 to
69d988c
Compare
Miouge1
reviewed
Apr 19, 2019
| @@ -68,6 +68,9 @@ def _checkout_repo(self, gevent, repo_path): | |||
| 'expected_sha': gevent.head_sha, | |||
| 'sha': gitbin.rev_parse('HEAD') | |||
| }) | |||
|
|
|||
| if FFCONFIG.failfast['build']['rebase'] is True: | |||
There was a problem hiding this comment.
if FFCONFIG.failfast['build']['rebase']: is probably more pythonic
Miouge1
reviewed
Apr 19, 2019
|
|
||
|
|
||
| def strtobool(s): | ||
| if s in ["yes", "on", "true", "True", "TRUE"]: |
There was a problem hiding this comment.
You can refactor this as simple one liner return s in ["yes", "on", ...]
|
Automatic rebase on master would be awesome in Kubespray, but what happens when there is a conflict? Would it fail the GitHub check or continue without rebase? |
|
it should fail yes |
|
I've deployed it once; But the sha is then different on Gitlab so the report back to github was broken. |
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.
No description provided.