Temporarily revert #7995 and #7921 due to #8208 #8321
Merged
Conversation
This file contains 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
This reverts commit 2521ee9.
This reverts commit aa4f0ad.
This reverts commit d2172d8.
This reverts commit a03b4a7.
This reverts commit 0284bfb.
This reverts commit 67092da.
This reverts commit 91fa33b.
This reverts commit 97f2c7b.
This reverts commit d5ae20c.
This reverts commit 9d33338.
This reverts commit 3aa45a2.
This reverts commit 200478e.
This reverts commit 1969327.
This reverts commit f972102.
This reverts commit a5986e3.
This reverts commit eefe45d.
This reverts commit 592a48e.
Mikolaj
changed the title
jneira
approved these changes
Jul 25, 2022
|
hmm just I ve seen it is against 3.8 so it should be fixed on master |
|
I hoped we can keep it on master and fix it quickly on master, so we only need to revert on 3.8. Do you think that many Windows users are building straight from master branch? Or is treating the branches differently a bad idea for another reason? |
|
nah agree on trying to fix it in master, will keep the issue opened to track it, thanks for take care! |
|
I think mergify doesn't permit skipping the delay for non-backports, so let me merge manually. |
|
I've tested the artifact generated by this prjust incase and ctrl+c works fine, as expected |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Yet another approach to (commit by commit) approach reverting #7995 on 3.8 branch due to #8208 and the 3.8 tag-for-GHC deadline.
This is made painful by the fact that we got sloppy and didn't rebase a subsequent PR and so the overall merge got complex instead of fast-forward. Also, some other PRs (at least one, but probably more) actually depend on this PR.
Based on #8319 (comment) I'm also reverting #7921 and, so far, this results in no revert conflicts. Let's see the CI.