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. #9878

Merged
merged 5 commits into from
Jun 15, 2024
Merged

Add MHS as a recognized compiler. #9878

merged 5 commits into from
Jun 15, 2024

Conversation

augustss
Copy link
Contributor

@augustss augustss commented Apr 9, 2024

The title says it all.

Copy link
Collaborator

@geekosaur geekosaur left a comment

Choose a reason for hiding this comment

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

Does this need additional code for compiler support? (cf. Distribution.Simple.{GHC,HaskellSuite,…})

@augustss
Copy link
Contributor Author

augustss commented Apr 9, 2024

I don't care about additional code right now. I just want to have mhs be recognized as a valid Haskell compiler to be used in .cabal files.

To build things with mhs I use mcabal anyway.

@geekosaur
Copy link
Collaborator

Looks like a hash needs to be updated:

  Distribution.Utils.Structured
    GenericPackageDescription:                                           FAIL (0.02s)
      tests/UnitTests/Distribution/Utils/Structured.hs:31:
      expected: 5a48c6570cbcf96af4c51f38962e37b5
       but got: f6306d42af1d4f88b269cbd6a7879e6d
      Use -p '/Distribution.Utils.Structured.GenericPackageDescription/' to rerun this test only.
    LocalBuildInfo:                                                      FAIL (0.02s)
      tests/UnitTests/Distribution/Utils/Structured.hs:31:
      expected: 6d668de33d7b4d5df3830e65e6941373
       but got: 214d441d7d9bf881624984de13980b37
      Use -p '/LocalBuildInfo/' to rerun this test only.

@Mikolaj
Copy link
Member

Mikolaj commented May 1, 2024

Let me rebase to verify CI passes after we worked around the github changes breakage.

@Mikolaj
Copy link
Member

Mikolaj commented May 1, 2024

@mergify rebase

Copy link
Contributor

mergify bot commented May 1, 2024

rebase

✅ Branch has been successfully rebased

@Mikolaj
Copy link
Member

Mikolaj commented May 1, 2024

Actually, @geekosaur was right all along --- the hashes need to be updated to the ones given in https://github.com/haskell/cabal/actions/runs/8908155162/job/24463289224?pr=9878. @augustss: I'm afraid that's the task of the PR author. We'd also need a tiny changelog file: https://github.com/haskell/cabal/blob/master/CONTRIBUTING.md#changelog. I think, we can skip a test in this case, but it never hurts to add one. Thank you for the PR!

@augustss
Copy link
Contributor Author

Is there any chance this fix could be merged soon?
I'm not asking for very much, just that one more compiler is recognized so I can upload my packages that has 'impl(mhs)' in them.
Or should I just give up and pretend my compiler is called ghc?

@ffaf1
Copy link
Collaborator

ffaf1 commented Jun 13, 2024

@augustss , for this to be merged you need to update the hashes, like @geekosaur suggested.

I would also add a simple comment to specify what MHS is longhand,

@augustss
Copy link
Contributor Author

I've added a comment, added a changelog entry, and updated the checksums.

@ulysses4ever ulysses4ever added squash+merge me Tell Mergify Bot to squash-merge and removed attention: needs-review labels Jun 14, 2024
@ulysses4ever
Copy link
Collaborator

It's been sitting for a while, so I take the liberty and apply the delay-passed label.

@ulysses4ever ulysses4ever added merge delay passed Applied (usually by Mergify) when PR approved and received no updates for 2 days attention: needs-backport 3.12 labels Jun 15, 2024
@ulysses4ever
Copy link
Collaborator

@mergify backport 3.12

Copy link
Contributor

mergify bot commented Jun 15, 2024

backport 3.12

✅ Backports have been created

@ulysses4ever
Copy link
Collaborator

@mergify refresh

Copy link
Contributor

mergify bot commented Jun 15, 2024

refresh

✅ Pull request refreshed

@mergify mergify bot merged commit 3169b87 into haskell:master Jun 15, 2024
53 checks passed
mergify bot pushed a commit that referenced this pull request Jun 15, 2024
* 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
@augustss
Copy link
Contributor Author

Thanks!

mergify bot added a commit that referenced this pull request Jun 16, 2024
* Add MHS as a recognized compiler. (#9878)

* 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

* fixup! Add MHS as a recognized compiler. (#9878)

---------

Co-authored-by: Lennart Augustsson <[email protected]>
Co-authored-by: brandon s allbery kf8nh <[email protected]>
erikd pushed a commit to erikd/cabal that referenced this pull request Jun 17, 2024
* Add MHS as a recognized compiler.

* Add Changelog entry

* Add comment.

* Update checksums.

* Update more checksums.

---------

Co-authored-by: Lennart Augustsson <[email protected]>
mmhat pushed a commit to mmhat/cabal that referenced this pull request Jun 24, 2024
* Add MHS as a recognized compiler.

* Add Changelog entry

* Add comment.

* Update checksums.

* Update more checksums.

---------

Co-authored-by: Lennart Augustsson <[email protected]>
@Bodigrim
Copy link
Collaborator

Too late now, but adding new constructors constitutes a breaking change. It should not have happened without bumping a major version of Cabal-syntax package:

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merge delay passed Applied (usually by Mergify) when PR approved and received no updates for 2 days re: --with-compiler Concerning option `-w` and similar squash+merge me Tell Mergify Bot to squash-merge
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants