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

Add MHS as a recognized compiler. (backport #9878) #10119

Merged
merged 2 commits into from
Jun 16, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 15, 2024

The title says it all.


This is an automatic backport of pull request #9878 done by [Mergify](https://mergify.com).

* Add MHS as a recognized compiler.

* Add Changelog entry

* Add comment.

* Update checksums.

* Update more checksums.

---------

Co-authored-by: Lennart Augustsson <[email protected]>
(cherry picked from commit 3169b87)

# Conflicts:
#	Cabal-tests/tests/UnitTests/Distribution/Utils/Structured.hs
@mergify mergify bot added the conflicts label Jun 15, 2024
Copy link
Contributor Author

mergify bot commented Jun 15, 2024

Cherry-pick of 3169b87 has failed:

On branch mergify/bp/3.12/pr-9878
Your branch is up to date with 'origin/3.12'.

You are currently cherry-picking commit 3169b879c.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   Cabal-syntax/src/Distribution/Compiler.hs
	new file:   changelog.d/pr-9878

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   Cabal-tests/tests/UnitTests/Distribution/Utils/Structured.hs

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@ulysses4ever
Copy link
Collaborator

@geekosaur could you possibly look into the conflicts? I'm running behind on some things this weekend

@geekosaur geekosaur force-pushed the mergify/bp/3.12/pr-9878 branch from a6ff347 to f0c3075 Compare June 15, 2024 22:44
@ulysses4ever ulysses4ever added the squash+merge me Tell Mergify Bot to squash-merge label Jun 15, 2024
@geekosaur geekosaur force-pushed the mergify/bp/3.12/pr-9878 branch from f0c3075 to abaa2bb Compare June 15, 2024 22:57
@geekosaur geekosaur force-pushed the mergify/bp/3.12/pr-9878 branch from abaa2bb to a76a37e Compare June 15, 2024 23:08
@mergify mergify bot merged commit 2338e1d into 3.12 Jun 16, 2024
53 checks passed
@mergify mergify bot deleted the mergify/bp/3.12/pr-9878 branch June 16, 2024 01:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport squash+merge me Tell Mergify Bot to squash-merge
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants