merge queue: embarking master (0a8508e) and #10933 together#11882
Closed
mergify[bot] wants to merge 2 commits into
Closed
merge queue: embarking master (0a8508e) and #10933 together#11882mergify[bot] wants to merge 2 commits into
mergify[bot] wants to merge 2 commits into
Conversation
- Add Y-forking import test - A test for detecting when the same config is imported via many different paths - Error on duplicate imports - Do the filtering in duplicateImportMsg - Use duplicateImportMsg for cycles too - Add haddocks to IORef parameter - Add changelog entry - Use ordNub instead of nub - Use NubList - Share implement of duplicate and cyclical messages - Update expectation for non-cyclical duplicate import - Only show a warning - Add woops project with a time cost - Use noticeDoc instead of warn - Render duplicate imports - Add Ord instance for Dupes, sort on dupesNormLocPath - Fixups after rebase - Satisfy hlint - Remove -XMultiWayIf - Remove mention of yops from the changelog - Satisfy fix-whitespace - Test with a time cost of duplicate imports - Fewer imports from PrettyPrint qualified as Disp - Add data ProjectImport replacing tuples - Combine fields as ProjectImport - Rename field to dupesImports - Add haddocks to Dupes fields - Mark test as flaky - Any test accessing stackage seems susceptible - Move unique duplicates to own test - Use legacy parser for path duplicates test - Add foo.cabal package so that packages exist - Satisfy fix-whitespace - Use local version of lts-21.25 - Remove repo - Use </> for expected paths - Note that this change gives a warning. - Exclude lts-21.25.config from typos - Detect duplicate imports after parsing - Merge upstream - Update duplicate import counts - Satisfy fourmolu - Move duplicate detection to calling module - Add parsing module haddock section header - Export only reportDuplicateImports - Test all project parser options - Add script tests - Add haddocks to reportDuplicateImportsh - Use Data.Function ((&)) pipelining - Inline do blockh - Satisfy fix-whitespace - Redo Ord Dupes - Try to enforce sorting - Add docs to ProjectImport - Add instances & doctests for sorting ProjectImport - Fix sorting of ProjectConfigPath - Update test expectation with correct sorting - Compare versions of compare - Update cabal.out for dedup tests - Rename to compareForDisplay - Add more detail to docProjectConfigFiles docs - Add haddocks and rename comparisons - Don't repeat the root comment - Pattern match on NonEmpty not List - Sort expectation by import chain length - Use GADTs for ProjectImport - Satisfy hlint, remove unused LANGUAGE pragmas - Bubble up Maybe URI - Add ProjectRoot constructorh - Rename ProjectImport to ProjectNode - Add Maybe URI to project skeleton - Use ProjectFilePath - Satisfy hlint - Add projectNodes - Redo detectDupes - Move duplicate imports to Import module - Move fetchImportConfig to Import module - Don't export parseProjectSkeleton - Don't re-export ProjectConfigSkeleton - Remove unnecessary primes - Add splitImports - Remove ProjectNodes and projectNodes - Move stuff to Client.ProjectConfig.Import - Fixup after rebase - Satisfy fourmolu - Don't monitor (Nothing :: Maybe URI) - Add type annotation for older ghc versions - Setup for doctests - Need -XConstraintKinds with older ghcsh - Update .out files for UniquePathDuplicates - Don't repeat recordMode - Remove +legacy-comparison - Note significance in changelog and movements - Less indent - Remove redundant comparison - Hide newtype ProjectFilePath - Don't export duplicateImportMsg or ProjectNode - Gut lts-21.25.config but leave notes
6 tasks
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
✨ The merge conditions cannot be satisfied due to failing checks. ✨
Branch master (0a8508e) and #10933 are embarked together for merge.
This pull request has been created by Mergify to speculatively check the mergeability of #10933.
You don't need to do anything. Mergify will close this pull request automatically when it is complete.
Required conditions of queue rule
defaultfor merge:check-neutral = Validate post jobcheck-skipped = Validate post jobcheck-success = Validate post job#approved-reviews-by >= 2[🛡 GitHub branch protection]#changes-requested-reviews-by = 0[🛡 GitHub branch protection]#review-threads-unresolved = 0[🛡 GitHub branch protection]check-success = Doctest Cabalcheck-neutral = Doctest Cabalcheck-skipped = Doctest Cabalcheck-success = Meta checkscheck-neutral = Meta checkscheck-skipped = Meta checkscheck-success = docs/readthedocs.org:cabalcheck-neutral = docs/readthedocs.org:cabalcheck-skipped = docs/readthedocs.org:cabalcheck-success = fourmolucheck-neutral = fourmolucheck-skipped = fourmolucheck-success = hlintcheck-neutral = hlintcheck-skipped = hlintcheck-success = Bootstrap post jobcheck-neutral = Bootstrap post jobcheck-skipped = Bootstrap post jobcheck-success = whitespacecheck-neutral = whitespacecheck-skipped = whitespacecheck-success = Check sdist post jobcheck-neutral = Check sdist post jobcheck-skipped = Check sdist post jobcheck-success = Changelogscheck-neutral = Changelogscheck-skipped = ChangelogsRequired conditions to stay in the queue:
#approved-reviews-by >= 2[🛡 GitHub branch protection]#changes-requested-reviews-by = 0[🛡 GitHub branch protection]#review-threads-unresolved = 0[🛡 GitHub branch protection]check-success = Doctest Cabalcheck-neutral = Doctest Cabalcheck-skipped = Doctest Cabalcheck-success = Meta checkscheck-neutral = Meta checkscheck-skipped = Meta checkscheck-success = docs/readthedocs.org:cabalcheck-neutral = docs/readthedocs.org:cabalcheck-skipped = docs/readthedocs.org:cabalcheck-success = Validate post jobcheck-neutral = Validate post jobcheck-skipped = Validate post jobcheck-success = fourmolucheck-neutral = fourmolucheck-skipped = fourmolucheck-success = hlintcheck-neutral = hlintcheck-skipped = hlintcheck-success = Bootstrap post jobcheck-neutral = Bootstrap post jobcheck-skipped = Bootstrap post jobcheck-success = whitespacecheck-neutral = whitespacecheck-skipped = whitespacecheck-success = Check sdist post jobcheck-neutral = Check sdist post jobcheck-skipped = Check sdist post jobcheck-success = Changelogscheck-neutral = Changelogscheck-skipped = Changelogs