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

Two fixes to multi repl command #10017

Merged
merged 2 commits into from
Jun 2, 2024
Merged

Conversation

mpickering
Copy link
Collaborator

  • Adds extra options to the multi-repl file (specified with ghc-options for example)
  • Fix the rendering of -j when finally invoking the repl

Both should be backported to 3.12 release

@Mikolaj
Copy link
Member

Mikolaj commented May 24, 2024

Let me rebase, since all the CI fixes have now landed.

@Mikolaj
Copy link
Member

Mikolaj commented May 24, 2024

@mergify rebase

Copy link
Contributor

mergify bot commented May 24, 2024

rebase

✅ Branch has been successfully rebased

@ulysses4ever
Copy link
Collaborator

Any chance for some tests?

@mpickering mpickering force-pushed the wip/multi-fixes branch 2 times, most recently from 1c0593d to d8ad5dc Compare May 30, 2024 15:03
@mpickering
Copy link
Collaborator Author

I have added a test now.

@Mikolaj
Copy link
Member

Mikolaj commented May 31, 2024

Wonderful. Let me set the merge label so that we can backport sooner.

@Mikolaj Mikolaj added the merge me Tell Mergify Bot to merge label May 31, 2024
@mergify mergify bot added the merge delay passed Applied (usually by Mergify) when PR approved and received no updates for 2 days label Jun 2, 2024
These options are configured into the program by Cabal, so we also need
to extract these and put them into the mutli-file.

Fixes haskell#10015
Before this was rendered as..

```
/run/current-system/sw/bin/ghc --interactive -package-env - -j 'NumJobs (Just 8)' ...
```

Due to this place not being updated when support for semaphores was
added.
@mergify mergify bot merged commit 6f1329b into haskell:master Jun 2, 2024
52 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
attention: needs-backport 3.12 attention: needs-review Cabal: cmd/repl merge delay passed Applied (usually by Mergify) when PR approved and received no updates for 2 days merge me Tell Mergify Bot to merge
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants