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

Revert "Fix #1131 : Add windows Ctrl+C handling" #1615

Merged
merged 1 commit into from
Jun 17, 2020

Conversation

aryairani
Copy link
Contributor

Revert #1611 due to macOS build regression / interaction with haskell/cabal#4739

@aryairani aryairani mentioned this pull request Jun 17, 2020
@sharno
Copy link
Contributor

sharno commented Jun 17, 2020

Instead of reverting, isn't this better handled with -optP-Wno-nonportable-include-path?
Seems that it'll succeed if we just silence this error.

example:
PostgREST/postgrest#1332

@aryairani
Copy link
Contributor Author

aryairani commented Jun 17, 2020

@sharno Maybe — I'm not sure I want to revert either:

What I'd like to do is go back in time to undo the merge and its effect on the git history, put better CI in place, and then try going forward again from there, including possibly the -optP-Wno-nonportable-include-path route or some other.

Unfortunately, undoing the effect on the git history isn't possible, as others have already pulled the failing master branch, so I believe reverting is still the best option for now. Then we can try to recreate your PR in a way that passes the updated CI.

So now I'm just waiting to confirm that https://travis-ci.org/github/unisonweb/unison/builds/699385107 ("updated CI") fails as expected, and then merge this.

@aryairani aryairani merged commit e465d51 into master Jun 17, 2020
@aryairani aryairani deleted the revert-1611-fix-windows-compile branch June 17, 2020 17:24
@pchiusano pchiusano mentioned this pull request May 11, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants