Skip to content

Conversation

@hasufell
Copy link
Member

Copy link
Member

@emilypi emilypi left a comment

Choose a reason for hiding this comment

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

Thanks @hasufell 💪

@Mikolaj
Copy link
Member

Mikolaj commented Sep 10, 2021

@Mergifyio update

@mergify
Copy link
Contributor

mergify bot commented Sep 10, 2021

Command update: success

Branch has been successfully updated

@Mikolaj
Copy link
Member

Mikolaj commented Sep 10, 2021

Huh, is there a way to tell mergify to rebase instead of merge?

@emilypi
Copy link
Member

emilypi commented Sep 10, 2021

@Mikolaj you'll need a different tag. Right now, the update method for the merge me tag is rebase, but the merge strategy is a dumb merge. You can add a variation here: https://github.com/haskell/cabal/blob/master/.github/mergify.yml

@Mikolaj
Copy link
Member

Mikolaj commented Sep 10, 2021

thank you, so I made a mistake; I should have just added the merge me label and it would rebase fine

@jneira
Copy link
Member

jneira commented Sep 10, 2021

Huh, is there a way to tell mergify to rebase instead of merge?

just in case you want to use it: https://docs.mergify.io/commands/#rebase

@Mikolaj
Copy link
Member

Mikolaj commented Sep 10, 2021

@Mergifyio rebase

@mergify
Copy link
Contributor

mergify bot commented Sep 10, 2021

Command rebase: success

Branch already up to date

@Mikolaj
Copy link
Member

Mikolaj commented Sep 10, 2021

huh, I hoped it would remove the merge commit

@hasufell
Copy link
Member Author

Nothing beats the command line with a non-machine merge commit that is GPG signed. ;)

@emilypi
Copy link
Member

emilypi commented Sep 10, 2021

Boo - we're not nerds!

@emilypi emilypi merged commit 17e5a84 into haskell:master Sep 10, 2021
hasufell added a commit to hasufell/cabal that referenced this pull request Oct 7, 2021
emilypi pushed a commit that referenced this pull request Oct 7, 2021
hasufell added a commit to hasufell/cabal that referenced this pull request Oct 8, 2021
emilypi added a commit that referenced this pull request Oct 8, 2021
* rewrite paths to configure

* add gitlab ci integration to cabal

* Add darwin aarch64 support to CI (#7636)

* Add i386 build (#7700)

No CI neeeded

* Bump to 3.4.1.0

* Fix CI on M1

* Fix linux build

* Use cabal.project.release in gitlab CI

* Force cabal to use a build plan where exe:cabal-plan is enabled

(cherry picked from commit 26b94bb)

* Update boostrap CI to the ghcup format GHA now uses

* Add ghcup install call to boostrap script to be future safe

* Fix quick jobs

Co-authored-by: Tamar Christina <tamar@zhox.com>
Co-authored-by: Emily Pillmore <emilypi@cohomolo.gy>
Co-authored-by: Fendor <power.walross@gmail.com>
Co-authored-by: Mikolaj Konarski <mikolaj@well-typed.com>
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.

4 participants