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 cabal build #2776

Merged
merged 3 commits into from
Jul 26, 2021
Merged

Fix cabal build #2776

merged 3 commits into from
Jul 26, 2021

Conversation

rvl
Copy link
Contributor

@rvl rvl commented Jul 26, 2021 •
edited
Loading

Issue Number

Noticed in #2578.

Overview

  • Fixes a dependency in cabal.project.
  • Fix nix/cabal-shell.nix to use the forked libsodium-vrf package.
  • Fix .buildkite/rebuild.hs so that it compiles on macOS (because Filesystem.Path.CurrentOS)

Comments

@rvl rvl requested a review from Anviking July 26, 2021 11:10
@rvl rvl self-assigned this Jul 26, 2021
Anviking
Anviking approved these changes Jul 26, 2021
View reviewed changes
.buildkite/.envrc
@@ -1 +1 @@
eval $(lorri direnv --shell-file default.nix)
Copy link
Member

Choose a reason for hiding this comment

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

"use nix" is a valid .envrc? 🤔

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes it is: https://direnv.net/man/direnv-stdlib.1.html#codeuse-ltprogramnamegt-ltversiongtcode
I found nix-direnv which is better than lorri.

@Anviking
Copy link
Member

Anviking commented Jul 26, 2021 •
edited
Loading

nix-shell nix/cabal-shell.nix --run "cabal build all" passed locally for me
Nightly: https://buildkite.com/input-output-hk/cardano-wallet-nightly/builds/1033#9d95c97c-fc38-4aa7-927b-b09abddb9b80

Trying again with different cache directory: https://buildkite.com/input-output-hk/cardano-wallet-nightly/builds/1034#11403dd9-d497-457f-8cb1-834b3762aef1

@rvl
Copy link
Contributor Author

rvl commented Jul 26, 2021

Thanks @Anviking.
I don't think it's possible to override those environment variables if they are set in the pipeline yaml.
So I just deleted the /build/cardano-wallet.store directory on each build agent.

@Anviking Anviking mentioned this pull request Jul 26, 2021
Merged
9 tasks
@Anviking
Copy link
Member

Looks like it worked finally https://buildkite.com/input-output-hk/cardano-wallet-nightly/builds/1036 🎉

bors r+

@iohk-bors
Copy link
Contributor

iohk-bors bot commented Jul 26, 2021

Build succeeded:

@iohk-bors iohk-bors bot merged commit a2353e9 into master Jul 26, 2021
@iohk-bors iohk-bors bot deleted the rvl/fix-cabal-build branch July 26, 2021 16:26
iohk-bors bot added a commit that referenced this pull request Jul 30, 2021
@iohk-bors @Anviking @rvl
Merge #2763
402450d 
2763: Basic Alonzo support r=Anviking a=Anviking

# Issue Number

ADP-1025

# Overview

<!-- Detail in a few bullet points the work accomplished in this PR -->

- [x] Ensure the wallet can run in Alonzo
- [x] Get all integration tests green
- [x] Fix warnings
- [x] Cleanup
    - <s>[ ]Test that addresses don't affect the min ada value</s> Existing integration tests should be enough
    - [x] <s>Does it still work on testnet? -> The ledger function in question cannot know the current network, so would be highly surprising if it didn't work on testnet </s>
    - [x] Update MinUTxOValue properties to generate both ShelleyMA and Alonzo cases
    - [ ] Go through everything from start to finish 
- [x] Run integration tests on both Mary and alonzo
    - [x] Check that the Mary era is actually picked up, and it's not just running Alonzo twice
- <s>[ ] Using cardano-node 1.28.0 tag</s> -> #2778
- <s>[x] Cabal build also works</s> -> #2776

# Comments

- [Hydra jobset](https://hydra.iohk.io/jobset/Cardano/cardano-wallet-pr-2763)
- [Cabal Nightly build](https://buildkite.com/input-output-hk/cardano-wallet-nightly/builds?branch=anviking%2FADP-952%2Falonzo) (use environment variable `step=cabal` when creating a new build)


Co-authored-by: Johannes Lund <[email protected]>
Co-authored-by: Rodney Lorrimar <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Anviking Anviking Anviking approved these changes

Assignees

@rvl rvl

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@rvl @Anviking