Skip to content

Revert "Merge pull request #10534#11820

Merged
mergify[bot] merged 2 commits into
masterfrom
revert-t10534
May 16, 2026
Merged

Revert "Merge pull request #10534#11820
mergify[bot] merged 2 commits into
masterfrom
revert-t10534

Conversation

@ulysses4ever

Copy link
Copy Markdown
Collaborator

This reverts commit 8974189, reversing changes made to 41f5e57 as suggested in #11810 (comment)

I assume this patch doesn't change a behaviour of any released cabal, so Template B is appropriate.


Template B: This PR does not modify behaviour or interface

E.g. the PR only touches documentation or tests, does refactorings, etc.

Include the following checklist in your PR:

  • Patches conform to the coding conventions.
  • Is this a PR that fixes CI? If so, it will need to be backported to older cabal release branches (ask maintainers for directions).

…g-speed"

This reverts commit 8974189, reversing
changes made to 41f5e57.
@Bodigrim

Copy link
Copy Markdown
Collaborator

The commit message says "This reverts commit 8974189, reversing changes made to 41f5e57". What does reverting 8974189 has to do with 41f5e57?

@ulysses4ever

Copy link
Copy Markdown
Collaborator Author

What is going on with the failing test??

@ulysses4ever

Copy link
Copy Markdown
Collaborator Author

@Bodigrim, this commit message was automatically generated by Git. On one hand, I don't understand it as well. On the other hand, I didn't want to edit something that Git produces + merge commits are magic anyways. If you propose we cut the ending, I can do it. Do you?

@ulysses4ever

Copy link
Copy Markdown
Collaborator Author

ftr the command was git revert -m 1 8974189e4

@Bodigrim

Bodigrim commented May 13, 2026

Copy link
Copy Markdown
Collaborator

OK, got it. Sorry for confusion, I think I never used git revert with -m, so the commit message looked unfamiliar.

@zlonast

zlonast commented May 13, 2026

Copy link
Copy Markdown
Collaborator

you have a error

  stderr:
  --- /tmp/cabal-testsuite-116937/cabal.dist/cabal.out.normalized	2026-05-12 22:31:34.659904940 +0000
  +++ /tmp/cabal-testsuite-116937/cabal.dist/cabal.comp.out.normalized	2026-05-12 22:31:34.659758187 +0000
  @@ -11,5 +11,5 @@
   Error: [Cabal-7554]
   can't find source for MyDummy in ., cabal.dist/work/./dist/build/<ARCH>/ghc-<GHCVER>/MainIsExe-0.1/x/Exe/build/Exe/autogen, cabal.dist/work/./dist/build/<ARCH>/ghc-<GHCVER>/MainIsExe-0.1/x/Exe/build/global-autogen
   CallStack (from HasCallStack):
  -  dieWithException, called at src/Distribution/Simple/PreProcess.hs:315:13 in Cabal-3.17.0.0-inplace:Distribution.Simple.PreProcess
  +  dieWithException, called at src/Distribution/Simple/PreProcess.hs:311:11 in Cabal-3.17.0.0-inplace:Distribution.Simple.PreProcess

I think this could have had an impact? #11703

+ Error: [Cabal-7125]
+ Failed to build MainIsExe-0.1-inplace-Exe. The exception was:
+   -----BEGIN CABAL OUTPUT-----
Error: [Cabal-7554]
can't find source for MyDummy in ., cabal.dist/work/./dist/build/<ARCH>/ghc-<GHCVER>/MainIsExe-0.1/x/Exe/build/Exe/autogen, cabal.dist/work/./dist/build/<ARCH>/ghc-<GHCVER>/MainIsExe-0.1/x/Exe/build/global-autogen
- Error: [Cabal-7125]
- Failed to build MainIsExe-0.1-inplace-Exe.
+ CallStack (from HasCallStack):
+   dieWithException, called at src/Distribution/Simple/PreProcess.hs:315:13 in Cabal-3.17.0.0-inplace:Distribution.Simple.PreProcess
+ 

I think it's just worth changing cabal.out for MainIsExe

@ulysses4ever

Copy link
Copy Markdown
Collaborator Author

thanks a lot @zlonast , will try in a moment

@ulysses4ever ulysses4ever added merge me Tell Mergify Bot to merge and removed attention: needs-review labels May 13, 2026
@mergify mergify Bot added ready and waiting Mergify is waiting out the cooldown period merge delay passed Applied (usually by Mergify) when PR approved and received no updates for 2 days queued labels May 13, 2026
@mergify

mergify Bot commented May 15, 2026

Copy link
Copy Markdown
Contributor

Merge Queue Status

This pull request spent 3 hours 17 minutes 43 seconds in the queue, including 3 hours 6 minutes 40 seconds running CI.

Required conditions to merge
  • #approved-reviews-by >= 2 [🛡 GitHub branch protection]
  • #changes-requested-reviews-by = 0 [🛡 GitHub branch protection]
  • #review-threads-unresolved = 0 [🛡 GitHub branch protection]
  • any of [🛡 GitHub branch protection]:
    • check-success = Doctest Cabal
    • check-neutral = Doctest Cabal
    • check-skipped = Doctest Cabal
  • any of [🛡 GitHub branch protection]:
    • check-success = Meta checks
    • check-neutral = Meta checks
    • check-skipped = Meta checks
  • any of [🛡 GitHub branch protection]:
    • check-success = docs/readthedocs.org:cabal
    • check-neutral = docs/readthedocs.org:cabal
    • check-skipped = docs/readthedocs.org:cabal
  • any of [🛡 GitHub branch protection]:
    • check-success = Validate post job
    • check-neutral = Validate post job
    • check-skipped = Validate post job
  • any of [🛡 GitHub branch protection]:
    • check-success = fourmolu
    • check-neutral = fourmolu
    • check-skipped = fourmolu
  • any of [🛡 GitHub branch protection]:
    • check-success = hlint
    • check-neutral = hlint
    • check-skipped = hlint
  • any of [🛡 GitHub branch protection]:
    • check-success = Bootstrap post job
    • check-neutral = Bootstrap post job
    • check-skipped = Bootstrap post job
  • any of [🛡 GitHub branch protection]:
    • check-success = whitespace
    • check-neutral = whitespace
    • check-skipped = whitespace
  • any of [🛡 GitHub branch protection]:
    • check-success = Check sdist post job
    • check-neutral = Check sdist post job
    • check-skipped = Check sdist post job
  • any of [🛡 GitHub branch protection]:
    • check-success = Changelogs
    • check-neutral = Changelogs
    • check-skipped = Changelogs

mergify Bot added a commit that referenced this pull request May 15, 2026
mergify Bot added a commit that referenced this pull request May 16, 2026
@mergify mergify Bot merged commit 78871b0 into master May 16, 2026
214 checks passed
@mergify mergify Bot deleted the revert-t10534 branch May 16, 2026 02:43
@mergify mergify Bot removed the queued label May 16, 2026
@ulysses4ever ulysses4ever linked an issue Jun 4, 2026 that may be closed by this pull request
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 merge me Tell Mergify Bot to merge ready and waiting Mergify is waiting out the cooldown period

Projects

None yet

Development

Successfully merging this pull request may close these issues.

cabal from master doesn't re-run preprocessing when file changes

4 participants