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

Remove merge check from circle CI configuration. #613

Merged
merged 3 commits into from
Jul 23, 2019

Conversation

jbarrick-mesosphere
Copy link
Member

What type of PR is this?

/kind bug

What this PR does / why we need it:

This removes the merge before running tests in Circle CI. I believe this check provides no value as it runs at commit time and not at merge time, so there are no guarantees that this even tests the correct merge target and creates difficulty with PR branches. To enforce merge safety, we should use GitHub branch settings.

Which issue(s) this PR fixes:

Fixes #568

Special notes for your reviewer:

Does this PR introduce a user-facing change?:

NONE

Copy link
Contributor

@alenkacz alenkacz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I need to think about it more but I guess it should be fine. I don't like the restriction pushed by github on you that you have to have the branch on top of master before merging. We had that enforced on Marathon once and I was just rebasing branches all the time because you merge one and all others are obsolete. So it was a lot of work and it hardly ever uncovered some bug we would caught AFTER merge. I don't remember such case...

@@ -45,7 +37,7 @@ jobs:
- "/go/bin"
workflows:
version: 2
formatting:
test:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should the workflow be named the same as one of the step? 🤔

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well, I think it's an improvement over "formatting", but I'm not sold on it beyond that :)

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

haha, true to that :)

@jbarrick-mesosphere
Copy link
Member Author

I need to think about it more but I guess it should be fine. I don't like the restriction pushed by github on you that you have to have the branch on top of master before merging. We had that enforced on Marathon once and I was just rebasing branches all the time because you merge one and all others are obsolete. So it was a lot of work and it hardly ever uncovered some bug we would caught AFTER merge. I don't remember such case...

Once we have Prow, I believe tide is able to automate the process of testing these PRs against the latest master and merging them.

@alenkacz
Copy link
Contributor

agreed with the tide thing

@alenkacz alenkacz merged commit 2bc1cb6 into kudobuilder:master Jul 23, 2019
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

Successfully merging this pull request may close these issues.

CI Builds Need to Work Against Branch Releases
2 participants