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

Backport #10546: Deduplicate "using config from" message #10753

Merged
merged 2 commits into from
Jan 14, 2025

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 14, 2025

Adds an Ord instance for ProjectConfigPath and fixes the duplication in the reported "Configuration is affected by the following files", fixes #10509 by using docProjectConfigFiles instead of docProjectConfigPath.

Template Α: This PR modifies behaviour or interface

Include the following checklist in your PR:


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

- Consider URI in Ord instance
- Use <> in Ord instance of ProjectConfigPath
- Add unconsProjectConfigPath
- Add docProjectConfigFiles
- Remove docProjectConfigPaths
- Clarify sorting haddocks for Ord ProjectConfigPath

(cherry picked from commit 124d471)
- Add woops test
- Regen expected output without duplication
- Add "when using config from" tests
- Remove unnecessary normalizeWindowsOutput
- Change assertion message
- Match on (\n|\r\n) for line endings
- Note /tmp/cabal-testsuite-*/ not seen on Windows
- Always have the project itself sort first
- Use with-ghc.config with woops project
- Remove docProjectConfigPaths
- docProjectConfigFiles is the better name when not reporting "imported by"
- Use --dry-run for config listing tests
- Only use woops project once in tests
- Don't use same project twice in tests
- Put dedup test into its own folder
- Simplify the project file names
- Can be done now that the test is in its own folder
- Move using config dedup test to ProjectImport dir
- Remove an additional test on yops project
- checking "using config from message" without URI imports
- Add simple test for changelog
- Better explain the message changes
- Redo the test so the project doesn't sort 1st
- Don't need to specify default project explicitly
- Add a z-empty.config lexically sorted last

(cherry picked from commit 73a13f1)
@mergify mergify bot mentioned this pull request Jan 14, 2025
6 tasks
@mergify mergify bot added the backport label Jan 14, 2025
@Kleidukos Kleidukos added the merge me Tell Mergify Bot to merge label Jan 14, 2025
@mergify mergify bot merged commit 4bb2f7c into 3.14 Jan 14, 2025
51 checks passed
@mergify mergify bot deleted the mergify/bp/3.14/pr-10546 branch January 14, 2025 16:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport merge me Tell Mergify Bot to merge
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants