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

Mergify: create configuration #1151

Merged
merged 8 commits into from
Jan 4, 2021

Conversation

jneira
Copy link
Member

@jneira jneira commented Jan 3, 2021

smart enables Strict Merge but only update one pull request against its base branch at a time. This allows you to e.g., save CI time, as Mergify will queue the mergeable pull requests and update them serially, one at a time.

  • possible changes:

Of course, it requires install the mergify app in the repo

@jneira jneira force-pushed the mergify/jneira/config-update branch from c65523f to b5413b6 Compare January 3, 2021 07:40
@jneira jneira force-pushed the mergify/jneira/config-update branch from b5413b6 to c2860a9 Compare January 3, 2021 07:42
Copy link
Collaborator

@pepeiborra pepeiborra left a comment

Choose a reason for hiding this comment

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

Great idea, thanks @jneira

.github/mergify.yml Outdated Show resolved Hide resolved
.github/mergify.yml Show resolved Hide resolved
.github/mergify.yml Outdated Show resolved Hide resolved
- status-success=test (8.6.4, ubuntu-latest)
- status-success=test (windows-latest, 8.10.2.2)

- 'status-success=ci/circleci: cabal'
Copy link
Collaborator

Choose a reason for hiding this comment

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

can we drop this one since the cabal build is already covered by the GitHub Actions?

Copy link
Member Author

Choose a reason for hiding this comment

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

yeah, maybe we should remove it entirely, but we can start not adding here

Copy link
Collaborator

Choose a reason for hiding this comment

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

I have removed it in #1152

- 'status-success=ci/circleci: ghc-8.10.2'
- 'status-success=ci/circleci: ghc-8.6.5'
- 'status-success=ci/circleci: ghc-8.8.4'
- 'status-success=ci/circleci: ghc-default'
Copy link
Collaborator

Choose a reason for hiding this comment

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

Can we drop this one since it's unclear what ghc-default means?

Copy link
Member Author

Choose a reason for hiding this comment

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

ghc-default is using the default stack.yaml, without version
maybe we should change the name in ci (and here too, but keeping it in any case)

Copy link
Collaborator

Choose a reason for hiding this comment

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

I have deleted it in #1152

@pepeiborra
Copy link
Collaborator

I enabled the Mergify integration with this Github repo, but it needs to be validated by an admin of the Haskell org

.github/mergify.yml Outdated Show resolved Hide resolved
.github/mergify.yml Outdated Show resolved Hide resolved
.github/mergify.yml Outdated Show resolved Hide resolved
Copy link
Collaborator

@alanz alanz left a comment

Choose a reason for hiding this comment

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

Happy with the concept.

And happy with squash or merge as strategy

.github/mergify.yml Outdated Show resolved Hide resolved
.github/mergify.yml Outdated Show resolved Hide resolved
Copy link
Member

@Ailrun Ailrun left a comment

Choose a reason for hiding this comment

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

LGTM

@jneira jneira merged commit 1269d89 into haskell:master Jan 4, 2021
@jneira jneira deleted the mergify/jneira/config-update branch January 15, 2021 06:51
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.

Consider using a merge bot to make easier pr handling
4 participants