Skip to content

Mergify: create configuration #1151

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.

Sign up for GitHub

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

Merged
merged 8 commits into from
Jan 4, 2021
Merged

Mergify: create configuration #1151

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c2860a9
Create mergify config
jneira Jan 3, 2021
aa52d7d
Use smart+fasttrack for strict merges
jneira Jan 3, 2021
142431b
Remove circleci cabal job
jneira Jan 3, 2021
3d8e5e6
Use squash as merge method
jneira Jan 3, 2021
a6e9b69
Remove auto delete pr branches
jneira Jan 3, 2021
47fb4ea
Merge branch 'master' into mergify/jneira/config-update
jneira Jan 3, 2021
4ff9cf3
Merge branch 'master' into mergify/jneira/config-update
jneira Jan 4, 2021
dd28ada
Merge branch 'master' into mergify/jneira/config-update
jneira Jan 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 37 additions & 0 deletions .github/mergify.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
pull_request_rules:
- actions:
merge:
strict: smart+fasttrack
method: squash
name: Automatically merge pull requests
conditions:
- status-success=bench (8.10.2, ubuntu-latest)
- status-success=bench (8.6.5, ubuntu-latest)
- status-success=bench (8.8.4, ubuntu-latest)
- status-success=nix (default, macOS-latest)
- status-success=nix (default, ubuntu-latest)
- status-success=test (8.10.3, ubuntu-latest)
- status-success=test (8.10.3, windows-latest)
- status-success=test (8.10.2, ubuntu-latest)
- status-success=test (8.10.1, ubuntu-latest)
- status-success=test (8.10.1, windows-latest)
- status-success=test (8.8.4, ubuntu-latest)
- status-success=test (8.8.3, ubuntu-latest)
- status-success=test (8.8.2, ubuntu-latest)
- status-success=test (8.6.5, ubuntu-latest)
- status-success=test (8.6.5, windows-latest)
- status-success=test (8.6.4, ubuntu-latest)
- status-success=test (windows-latest, 8.10.2.2)

- 'status-success=ci/circleci: ghc-8.10.1'
- 'status-success=ci/circleci: ghc-8.10.3'
- 'status-success=ci/circleci: ghc-8.6.4'
- 'status-success=ci/circleci: ghc-8.8.2'
- 'status-success=ci/circleci: ghc-8.8.3'
- '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


- label=merge me
- '#approved-reviews-by>=1'