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

Fix various issues #4024

Merged
merged 2 commits into from
Feb 1, 2024
Merged

Fix various issues #4024

merged 2 commits into from
Feb 1, 2024

Conversation

michaelpj
Copy link
Collaborator

@michaelpj michaelpj commented Jan 29, 2024

The first thing here is quite bad - my mistake! Unfortunately I got it all tangled in some other changes, but I think they're uncontroversial.

  • Make sure that we are always referring to the local libraries and not the published Hackage packages!
    • This needs a cabal-version bump
  • Make sure every component imports the default stanzas
  • Add a defaults stanza for default-language
  • Add a tests-default stanza for making sure test suites are built threaded
  • Remove unnecessary warning-related ghc-options
  • Use the pedantic stanza instead of manual checks for pedantic

@michaelpj michaelpj requested a review from fendor as a code owner January 29, 2024 10:07
@michaelpj
Copy link
Collaborator Author

cc also @jhrcek

Copy link
Collaborator

@jhrcek jhrcek left a comment

Choose a reason for hiding this comment

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

Two nitpicks, otherwise nice consolidation. I'll update my open PRs once this is merged.



test-suite func-test
import: common-deps
import: defaults
, test-defaults
Copy link
Collaborator

Choose a reason for hiding this comment

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

You can remove "-threaded -rtsopts -with-rtsopts=-N" from func-test now that you're importing test-defaults

-- Depends on shake-bench which is unbuildable after this point
if impl(ghc >= 9.5)
buildable: False
type: exitcode-stdio-1.0
default-language: Haskell2010
Copy link
Collaborator

Choose a reason for hiding this comment

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

You can remove -Wall -Wno-name-shadowing from benchmark now that you're importing warnings.

@michaelpj
Copy link
Collaborator Author

Some ghcide tests seem to be failing repeatably, but only on particular platform/GHC version combos. I also can't reproduce it, and I haven't touched ghcide 😬

@michaelpj michaelpj force-pushed the mpj/central-cabal-tidying branch from 5b9b487 to dd74b75 Compare January 29, 2024 18:04
@fendor
Copy link
Collaborator

fendor commented Jan 30, 2024

The ghcide tests looks like they suddenly are picking up HLS as the cradle root which is taking forever and probably wrong. I can look into it.

- Make sure that we are always referring to the local libraries and not
  the published Hackage packages!
    - This needs a `cabal-version` bump
- Make sure every component imports the default stanzas
- Add a `defaults` stanza for `default-language`
- Add a `tests-default` stanza for making sure test suites are built
  threaded
- Remove unnecessary warning-related `ghc-options`
- Use the `pedantic` stanza instead of manual checks for `pedantic`
@michaelpj michaelpj force-pushed the mpj/central-cabal-tidying branch from dd74b75 to b4d9eb5 Compare February 1, 2024 11:06
@michaelpj
Copy link
Collaborator Author

hooray, green

@michaelpj michaelpj merged commit 5af02dc into master Feb 1, 2024
39 checks passed
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.

3 participants