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

Update ledger #3690

Merged
merged 5 commits into from
Apr 5, 2022
Merged

Update ledger #3690

merged 5 commits into from
Apr 5, 2022

Conversation

lehins
Copy link
Contributor

@lehins lehins commented Apr 4, 2022

Brings ledger and consensus in sync.

Also took care of a TODO: relax constraint from Applicative to Functor

Updated GithubActions CI to pin secp256k1

@nc6
Copy link
Contributor

nc6 commented Apr 4, 2022

Though note also #3686

@lehins
Copy link
Contributor Author

lehins commented Apr 4, 2022

@nc6 Yes, #3686 is very similar, however target branch is not master, so at some point fast forward or a merge will bring these two PRs together

@lehins
Copy link
Contributor Author

lehins commented Apr 5, 2022

bors merge

iohk-bors bot added a commit that referenced this pull request Apr 5, 2022
3690: Update ledger r=lehins a=lehins

Brings ledger and consensus in sync.

Also took care of a `TODO`.

Updated GithubActions CI to account for secp256k1, except for Windows, since that one will be solved shortly in base, after which we can adopt the approach here in consensus and in cardano-node

Co-authored-by: Alexey Kuleshevich <alexey.kuleshevich@iohk.io>
@iohk-bors
Copy link
Contributor

iohk-bors bot commented Apr 5, 2022

This PR was included in a batch that successfully built, but then failed to merge into master. It will not be retried.

Additional information:

{"message":"2 of 4 required status checks have not succeeded: 1 failing.","documentation_url":"https://docs.github.com/articles/about-protected-branches"}

@amesgen
Copy link
Member

amesgen commented Apr 5, 2022

Rebasing on top of/merging master should fix the bors failure (as of #3687, which fixed the GH Windows job failure due to missing libsecp256k1).

@lehins
Copy link
Contributor Author

lehins commented Apr 5, 2022

@amesgen Thank you for letting me know. It's done. Will wait now for CI to turn green 😄

@nfrisby
Copy link
Contributor

nfrisby commented Apr 5, 2022

@lehins can you cleanup/refine the PR description regarding secp256k1 and Windows? The PR descriptions in this repo end up in the merge commits. Thanks much for the PR!

@lehins
Copy link
Contributor Author

lehins commented Apr 5, 2022

The PR descriptions in this repo end up in the merge commits.

That's great, didn't know that.

Cleaned up.

@lehins
Copy link
Contributor Author

lehins commented Apr 5, 2022

bors merge

@iohk-bors
Copy link
Contributor

iohk-bors bot commented Apr 5, 2022

@iohk-bors iohk-bors bot merged commit 08eced8 into master Apr 5, 2022
@iohk-bors iohk-bors bot deleted the lehins/update-ledger branch April 5, 2022 23:56
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.

4 participants