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

project planning: fix #10686 regression #10771

Merged
merged 1 commit into from
Feb 3, 2025

Conversation

alt-romes
Copy link
Collaborator

@alt-romes alt-romes commented Jan 31, 2025

We previously only fetched the compiler in
instantiateProjectConfigSkeletonFetchingCompiler if null (toListOf traverseCondTreeV skel) was false.

c89ab54 changed this to always configure the compiler, such that it could be later re-used when determining whether jsem was supported to clone git submodules concurrently.

This patch allows for the JobControl concurrency mechanism to be controlled without a compiler (which assumes -jsem is not supported), and restores the behaviour of not always configuring the compiler.

Fixes #10686

Please read Github PR Conventions and then fill in one of these two templates.


Template Α: This PR modifies behaviour or interface

Include the following checklist in your PR:

@alt-romes
Copy link
Collaborator Author

It's not clear to me how to add a test to this. I've tried adding a check for directory-does-not-exist for the scripts run in PackageTest, however, because of flags that set output directories more precisely.

@ffaf1 I've run out of time, but perhaps you could try to write a test if you'd like.

@Bodigrim
Copy link
Collaborator

Bodigrim commented Feb 1, 2025

I tested manually that the patch fixes my reproducer from #10686. Good enough for me, thanks.

Copy link
Collaborator

@ulysses4ever ulysses4ever left a comment

Choose a reason for hiding this comment

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

Makes sense to me. Thanks!

@alt-romes
Copy link
Collaborator Author

I don't know why the readthedocs check failed @ulysses4ever

@ulysses4ever
Copy link
Collaborator

@alt-romes it started recently and no one knows why. The branch needs an update to trigger rebuild as we can't trigger RTD rebuild manually, sadly.

Also, "no rebase" labels are reserved for special cases. Normally, you're expected to use "merge me".

@alt-romes alt-romes added merge me Tell Mergify Bot to merge and removed merge+no rebase labels Feb 1, 2025
@mergify mergify bot added the merge delay passed Applied (usually by Mergify) when PR approved and received no updates for 2 days label Feb 3, 2025
@Mikolaj
Copy link
Member

Mikolaj commented Feb 3, 2025

@mergify rebase

We previously only fetched the compiler in
`instantiateProjectConfigSkeletonFetchingCompiler` if
`null (toListOf traverseCondTreeV skel)` was false.

c89ab54 changed this to always
configure the compiler, such that it could be later re-used when
determining whether jsem was supported to clone git submodules
concurrently.

This patch allows for the JobControl concurrency mechanism to be
controlled without a compiler (which assumes -jsem is not supported),
and restores the behaviour of not always configuring the compiler.

Fixes haskell#10686
Copy link
Contributor

mergify bot commented Feb 3, 2025

rebase

✅ Branch has been successfully rebased

@Mikolaj
Copy link
Member

Mikolaj commented Feb 3, 2025

Phew, readthedocs passes fine now. Thank you whomever fixed it. :)

@mergify mergify bot added the ready and waiting Mergify is waiting out the cooldown period label Feb 3, 2025
@mergify mergify bot merged commit 595d023 into haskell:master Feb 3, 2025
52 checks passed
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 run creates dist-newstyle/cache/compiler in the current folder
4 participants