Skip to content

Conversation

@wismill
Copy link
Collaborator

@wismill wismill commented Feb 9, 2023

Fixes #8741


Copy link
Collaborator

@hsyl20 hsyl20 left a comment

Choose a reason for hiding this comment

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

LGTM! Thanks!

@wismill wismill force-pushed the wip/fix8741 branch 3 times, most recently from 1d55f0e to 7ee5208 Compare February 9, 2023 16:46
@wismill
Copy link
Collaborator Author

wismill commented Feb 9, 2023

@hsyl20 I think now I got the test right. But I see no Javascript-capable compiler in the CI to check if they work.

@hsyl20
Copy link
Collaborator

hsyl20 commented Feb 9, 2023

@wismill Yeah I've only run the JS test locally too. I don't know if there is a plan to add a JS job in CI (@Mikolaj?). It would require using an unofficial GHC build because bindists won't be distributed with the JS backend enabled.

@Mikolaj
Copy link
Member

Mikolaj commented Feb 9, 2023

@wismill Yeah I've only run the JS test locally too. I don't know if there is a plan to add a JS job in CI (@Mikolaj?).

Unfortunately not in the foreseeable future. We are currently unable to add newest 9.4 revisions due to some GHA quirks and getting to 9.6 soon enough after release will already be a big feat, if we make it.

Speaking about CI, please kindly rebase in 2h, after #8749 gets merged and then the CI breakage should be gone.

Copy link
Member

@Mikolaj Mikolaj left a comment

Choose a reason for hiding this comment

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

I haven't cross-checked with the original PR, but the things I see LGTM.

@Mikolaj
Copy link
Member

Mikolaj commented Feb 9, 2023

Let me rebase myself.

@Mikolaj
Copy link
Member

Mikolaj commented Feb 9, 2023

@mergify rebase

@mergify
Copy link
Contributor

mergify bot commented Feb 9, 2023

⚠️ This pull request got rebased on behalf of a random user of the organization.
This behavior will change on the 1st February 2023, Mergify will pick the author of the pull request instead.

To get the future behavior now, you can configure bot_account options (e.g.: bot_account: { author } or update_bot_account: { author }.

Or you can create a dedicated github account for squash and rebase operations, and use it in different bot_account options.

@mergify
Copy link
Contributor

mergify bot commented Feb 9, 2023

rebase

✅ Branch has been successfully rebased

@Mikolaj Mikolaj added merge me Tell Mergify Bot to merge attention: needs-review labels Feb 10, 2023
@mergify mergify bot added the merge delay passed Applied (usually by Mergify) when PR approved and received no updates for 2 days label Feb 12, 2023
@mergify
Copy link
Contributor

mergify bot commented Feb 12, 2023

⚠️ This pull request got rebased on behalf of a random user of the organization.
This behavior will change on the 1st February 2023, Mergify will pick the author of the pull request instead.

To get the future behavior now, you can configure bot_account options (e.g.: bot_account: { author } or update_bot_account: { author }.

Or you can create a dedicated github account for squash and rebase operations, and use it in different bot_account options.

@mergify mergify bot merged commit 78be2d5 into haskell:master Feb 12, 2023
@wismill
Copy link
Collaborator Author

wismill commented Feb 12, 2023

Will branch 3.10 be rebased on master or does it require a backport? Master branch is currently only a few commits ahead.

@Mikolaj
Copy link
Member

Mikolaj commented Feb 13, 2023

I think we will backport manually --- it's usually easy thanks to mergify and leaves a paper trail of the history of our decisions. Let me start with the CI fixes though, now that CI finally stabilized (famous last words).

@Mikolaj
Copy link
Member

Mikolaj commented Feb 13, 2023

@mergify backport 3.10

@mergify
Copy link
Contributor

mergify bot commented Feb 13, 2023

backport 3.10

✅ Backports have been created

mergify bot added a commit that referenced this pull request Feb 13, 2023
Ensure js-sources are used only with JavaScript arch (backport #8748)
@Mikolaj
Copy link
Member

Mikolaj commented Feb 13, 2023

Backported and merged to 3.10. @wismill, @hsyl20: thank you again.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

attention: needs-review 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.

Regression: cannot build streamly-0.8.3

3 participants