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.

Sign up for GitHub

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

Jump to bottom

Fix stack for windows #1789

Merged
merged 1 commit into from
Mar 20, 2020
Merged

Fix stack for windows #1789

merged 1 commit into from
Mar 20, 2020

Conversation

kderme
Copy link
Contributor

@kderme kderme commented Mar 11, 2020

Related #1082
Continuation of #1774, which makes use of IntersectMBO/cardano-prelude#100

mrBliss
mrBliss reviewed Mar 12, 2020
View reviewed changes
stack.yaml Outdated
@@ -91,6 +94,7 @@ extra-deps:

# Windows only
- Win32-2.6.2.0
- hedgehog-1.0.1@sha256:b65b1ebde7b7fe8e693070916e45aa2ed63eea5e3f84ac3a8f9a0b7f8fcf0337
Copy link
Contributor

Choose a reason for hiding this comment

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

Why is this needed? The snapshot.yaml in cardano-prelude mentions hedgehog-1.0.2, so this is overriding it. Also, the cabal.project does not mention this constraint.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

My bad. I probably first tried stack on a pretty old commit which mentioned hedgehog-1.0

Copy link
Contributor

Choose a reason for hiding this comment

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

Related: #1796

@kderme
Copy link
Contributor Author

kderme commented Mar 12, 2020 •
edited
Loading

@mrBliss with this, ouroboros-network still depends on 3893f21db1665e7bab9e8c6504c547fc7c28f98c of prelude, but uses the resolver of fe76ec64f6b45259cc407a6d840dad79ee6063b6. Do you think this is an inconsistency we should fix? I just though bumping also the dependency could mean more cascading changes.

@kderme kderme force-pushed the kderme/windows-stack branch from 8a83a01 to 5b94fd6 Compare March 12, 2020 15:05
@mrBliss
Copy link
Contributor

mrBliss commented Mar 12, 2020

@kderme Yes, it's an inconsistency that should be fixed.

@kderme kderme force-pushed the kderme/windows-stack branch from 5b94fd6 to 5799724 Compare March 20, 2020 10:25
@kderme
Copy link
Contributor Author

kderme commented Mar 20, 2020

stack and cabal work on windows

mrBliss
mrBliss approved these changes Mar 20, 2020
View reviewed changes
Copy link
Contributor

@mrBliss mrBliss left a comment

Choose a reason for hiding this comment

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

LGTM

@kderme kderme force-pushed the kderme/windows-stack branch from 5799724 to 03e53cf Compare March 20, 2020 11:35
@mrBliss
Copy link
Contributor

mrBliss commented Mar 20, 2020

bors r+

iohk-bors bot added a commit that referenced this pull request Mar 20, 2020
@iohk-bors @kderme
Merge #1789
504b5af 
1789: Fix stack for windows r=mrBliss a=kderme

Related #1082
Continuation of #1774, which makes use of IntersectMBO/cardano-prelude#100

Co-authored-by: kderme <[email protected]>
@iohk-bors
Copy link
Contributor

iohk-bors bot commented Mar 20, 2020

Build failed

@mrBliss
Copy link
Contributor

mrBliss commented Mar 20, 2020

bors r+

iohk-bors bot added a commit that referenced this pull request Mar 20, 2020
@iohk-bors @kderme
Merge #1789
6aa8381 
1789: Fix stack for windows r=mrBliss a=kderme

Related #1082
Continuation of #1774, which makes use of IntersectMBO/cardano-prelude#100

Co-authored-by: kderme <[email protected]>
@iohk-bors
Copy link
Contributor

iohk-bors bot commented Mar 20, 2020

Timed out

@mrBliss
Copy link
Contributor

mrBliss commented Mar 20, 2020

bors r+

@mrBliss
Copy link
Contributor

mrBliss commented Mar 20, 2020

FYI, the test failure on Hydra is transient and the sign of an overloaded CI machine (the test involves time).

@iohk-bors
Copy link
Contributor

iohk-bors bot commented Mar 20, 2020

Build succeeded

@iohk-bors iohk-bors bot merged commit 5682594 into master Mar 20, 2020
@iohk-bors iohk-bors bot deleted the kderme/windows-stack branch March 20, 2020 17:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mrBliss mrBliss mrBliss approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@kderme @mrBliss