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

Release ouroboros-network packages for cardano-node-1.35.5 #84

Merged
merged 4 commits into from
Nov 10, 2022
Merged

Release ouroboros-network packages for cardano-node-1.35.5 #84

merged 4 commits into from
Nov 10, 2022

Conversation

coot
Copy link
Contributor

@coot coot commented Nov 7, 2022

  • Added network-mux-0.2.0.0
  • Added ouroboros-network-0.2.0.0
  • Added ouroboros-network-framework-0.2.0.0
  • Added ouroboros-consensus-0.1.0.2

@coot coot changed the title coot/ouroboros network Release ouroboros-network packages for cardano-node-1.35.5 Nov 7, 2022
@coot coot requested a review from dnadales November 7, 2022 12:07
@coot
Copy link
Contributor Author

coot commented Nov 7, 2022 •
edited
Loading

I might need to update this PR once IntersectMBO/ouroboros-network#4120 is merged.

@michaelpj
Copy link
Contributor

Does this all build with the version of the ledger used in 1.35.4? I'm assuming it does?

@coot
Copy link
Contributor Author

coot commented Nov 7, 2022

It does build with cardano-ledger which is in release/cardano-node-1.35.x branch. But there seems to be a problem: in the release/cardano-node-1.35.x branch ledger comes from 52da70e5a0472cd4433876289f1aebaa0c6e5c85, and in CHaP ledger packages are from c7c63dabdb215ebdaed8b63274965966f2bf408f. So I don't actually know if it builds or not.

@coot
Copy link
Contributor Author

coot commented Nov 7, 2022

It builds because cardano-node builds, that's the evidence I have.

Ugh, once we have CHaP in ouroboros-network it will be much easier to reason what is actually used.

@michaelpj
Copy link
Contributor

Well, that's going to be a problem if you try to get the node@release/1.35 to build with these changes. So you probably want the ledger version you are using in network@release/cardano-node-1.35.x to be the same as the one in CHaP.

@michaelpj
Copy link
Contributor

It builds because cardano-node builds, that's the evidence I have.

i.e. node@release/1.35 builds where the only change is the inclusion of these packages as s-r-ps? or did you also change the ledger?

@coot
Copy link
Contributor Author

coot commented Nov 7, 2022

No ledger changes in the node; I want also to include ouroboros-network from CHaP for node-1.35.5.

@michaelpj
Copy link
Contributor

Okay, if indeed the node builds with these packages and no other changes then they must build with the corresponding version of the ledger, so it's okay. Just... tricky. Might be worth changing the ledger pin in network@release/cardano-node-1.3.5.x to match the node just to be on the safe side.

@coot
Copy link
Contributor Author

coot commented Nov 7, 2022

I agree, also the pin of plutus in network@release/cardano-node-1.35.x is wrong, node@release/1.35 is using [email protected].

@coot
Copy link
Contributor Author

coot commented Nov 7, 2022

I will not update the pins in network@release/cardano-node-1.35.x, it is a well without a bottom: the cardano-base packages are wrong as well, and it continues ... I'll just relay on the fact that I have a branch on top of node@release/1.35 which compiles.

@michaelpj
Copy link
Contributor

Okay, do whatever you need to do, so long as you're confident it works 👍

@coot coot mentioned this pull request Nov 7, 2022
Merged
2 tasks
@coot
Copy link
Contributor Author

coot commented Nov 7, 2022 •
edited
Loading

I have a proof using s-r-p's, that should be enough.

iohk-bors bot referenced this pull request in IntersectMBO/ouroboros-network Nov 9, 2022
@iohk-bors @mtullsen @coot
Merge #4120
e933084 
4120: Cherry picked network changes for cardano-node-1.35.5 release r=coot a=coot

This cherry-picked patches from the following PRs:

* #3794
* #3844
* #3785
* #3904
* #3915
* #3852
* #3970
* #3979
* #4015
* #4067
* #4004
* #4086
* #4113
* #4106
* #4127
* #4103

Also cherry-picked almost all the commits which modify GitHub actions:
* 18c5244 Run GitHub Actions on pull requests   
* 3adf5a9 Use newer version of io-sim           
* ee9b7a6 Fix GH Actions Windows CI: switch from pkgconf to pkg-config 
* e6cf074 github-actions: use `ubuntu-latest`   
* 9a8b959 Updated versions of github actions    
* fc8f8f0 Fix GH Actions Windows CI caching     
* 7f07c40 Windows Github Actions now use MSYS2  
* b21a7ce Fix chocolatey CI error
* #4134               

TODO:

* [x] bump versions of packages
* [x] input-output-hk/cardano-haskell-packages#84

Co-authored-by: Mark Tullsen <[email protected]>
Co-authored-by: Marcin Szamotulski <[email protected]>
@coot coot marked this pull request as ready for review November 10, 2022 09:26
@coot coot enabled auto-merge (rebase) November 10, 2022 09:27
@coot coot merged commit 2cfad1b into main Nov 10, 2022
@coot coot deleted the coot/ouroboros-network branch November 10, 2022 09:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@michaelpj michaelpj michaelpj approved these changes

@dnadales dnadales dnadales 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.
3 participants
@coot @michaelpj @dnadales