Skip to content

Use ouroboros-network-0.3.0.2 and ouroboros-network-framework-0.2.0.1 #5018

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
Merged
merged 3 commits into from
Mar 28, 2023
Merged

Use ouroboros-network-0.3.0.2 and ouroboros-network-framework-0.2.0.1 #5018

merged 3 commits into from
Mar 28, 2023

Conversation

coot
Copy link
Contributor

@coot coot commented Mar 24, 2023

No description provided.

@coot coot force-pushed the coot/4465_fixes branch 2 times, most recently from 29c3be2 to 3e78337 Compare March 24, 2023 16:00
kevinhammond
kevinhammond approved these changes Mar 24, 2023
View reviewed changes
Copy link
Contributor

@kevinhammond kevinhammond left a comment

Choose a reason for hiding this comment

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

Looks good!

@disassembler
Copy link
Contributor

bors r+

iohk-bors bot added a commit that referenced this pull request Mar 24, 2023
@iohk-bors @coot
Merge #5018
0f2a3c2 
5018: Use ouroboros-network-0.3.0.2 and ouroboros-network-framework-0.2.0.1 r=disassembler a=coot



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

iohk-bors bot commented Mar 24, 2023

Timed out.

@coot coot force-pushed the coot/4465_fixes branch from 3e78337 to 9dfd43f Compare March 24, 2023 19:50
@coot
Copy link
Contributor Author

coot commented Mar 24, 2023

bors merge

iohk-bors bot added a commit that referenced this pull request Mar 24, 2023
@iohk-bors @coot
Merge #5018
18c008a 
5018: Use ouroboros-network-0.3.0.2 and ouroboros-network-framework-0.2.0.1 r=coot a=coot



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

iohk-bors bot commented Mar 25, 2023

Timed out.

@disassembler
Copy link
Contributor

Bors r+

iohk-bors bot added a commit that referenced this pull request Mar 25, 2023
@iohk-bors @coot
Merge #5018
b0e61be 
5018: Use ouroboros-network-0.3.0.2 and ouroboros-network-framework-0.2.0.1 r=disassembler a=coot



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

iohk-bors bot commented Mar 25, 2023

Timed out.

@coot
Copy link
Contributor Author

coot commented Mar 25, 2023

bors merge

iohk-bors bot added a commit that referenced this pull request Mar 25, 2023
@iohk-bors @coot
Merge #5018
ce11003 
5018: Use ouroboros-network-0.3.0.2 and ouroboros-network-framework-0.2.0.1 r=coot a=coot



Co-authored-by: Marcin Szamotulski <[email protected]>
@coot
Copy link
Contributor Author

coot commented Mar 25, 2023 •
edited
Loading

GHA on staging finished (ce11003), but bors is s till pending.

The bors.toml file contains:

status = [
  "ci/pr/required",
]

but I don't see something like that in cicero, there's ci/pr/nix/required though. It might be doomed to timeout.

@iohk-bors
Copy link
Contributor

iohk-bors bot commented Mar 25, 2023

Timed out.

@coot
Copy link
Contributor Author

coot commented Mar 25, 2023

In master the ci/pr/required check was removed from bors.toml in PR #4923.

@coot coot force-pushed the coot/4465_fixes branch from 97998db to 60363c4 Compare March 27, 2023 10:18
@disassembler
Copy link
Contributor

bors r+

iohk-bors bot added a commit that referenced this pull request Mar 27, 2023
@iohk-bors @coot @disassembler
Merge #5018
e5b19c7 
5018: Use ouroboros-network-0.3.0.2 and ouroboros-network-framework-0.2.0.1 r=disassembler a=coot



Co-authored-by: Marcin Szamotulski <[email protected]>
Co-authored-by: Samuel Leathers <[email protected]>
@coot
Copy link
Contributor Author

coot commented Mar 27, 2023

@disassembler we should just remove bors.toml from this repo. It will timeout because there's no ci/pr/required job.

@iohk-bors
Copy link
Contributor

iohk-bors bot commented Mar 27, 2023

Canceled.

@dermetfan
Copy link
Contributor

bors merge

iohk-bors bot added a commit that referenced this pull request Mar 27, 2023
@iohk-bors @coot @disassembler
Merge #5018
7fe86c3 
5018: Use ouroboros-network-0.3.0.2 and ouroboros-network-framework-0.2.0.1 r=dermetfan a=coot



Co-authored-by: Marcin Szamotulski <[email protected]>
Co-authored-by: Samuel Leathers <[email protected]>
@iohk-bors
Copy link
Contributor

iohk-bors bot commented Mar 27, 2023

Build failed:

@dermetfan dermetfan mentioned this pull request Mar 27, 2023
Merged
iohk-bors bot added a commit that referenced this pull request Mar 27, 2023
@iohk-bors @dermetfan
Merge #5023
ff318c2 
5023: fix CI not running on bors branches r=disassembler a=dermetfan

Looks like this was broken in #4930 as `prAndBorsIo` was added but not used.

Also removed `nix` from the task name. I do not see what purpose it has and it makes the names unnecessarily long. Also we happen to need the old names in #5018.

Co-authored-by: Robin Stumm <[email protected]>
@coot @disassembler
haskell.nix: update to support CHaP revisions
930781a 
haskellNix: Update haskellNix & hackageNix
flake:  drop cardano-node-workbench from inputs
devshells: pin haskell-language-server
@disassembler
Copy link
Contributor

bors r+

iohk-bors bot added a commit that referenced this pull request Mar 28, 2023
@iohk-bors @coot
Merge #5018
bd322fb 
5018: Use ouroboros-network-0.3.0.2 and ouroboros-network-framework-0.2.0.1 r=disassembler a=coot



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

iohk-bors bot commented Mar 28, 2023

Timed out.

@disassembler
Copy link
Contributor

bors r+

iohk-bors bot added a commit that referenced this pull request Mar 28, 2023
@iohk-bors @coot
Merge #5018
298d44d 
5018: Use ouroboros-network-0.3.0.2 and ouroboros-network-framework-0.2.0.1 r=disassembler a=coot



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

iohk-bors bot commented Mar 28, 2023

Build failed:

@disassembler disassembler merged commit f0b4ac8 into release/1.35 Mar 28, 2023
@iohk-bors iohk-bors bot deleted the coot/4465_fixes branch March 28, 2023 18:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@disassembler disassembler disassembler approved these changes

@Jimbo4350 Jimbo4350 Jimbo4350 approved these changes

@kevinhammond kevinhammond kevinhammond approved these changes

@dcoutts dcoutts Awaiting requested review from dcoutts dcoutts is a code owner

@erikd erikd Awaiting requested review from erikd erikd is a code owner

@newhoggy newhoggy Awaiting requested review from newhoggy newhoggy is a code owner

@JaredCorduan JaredCorduan Awaiting requested review from JaredCorduan

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

Successfully merging this pull request may close these issues.
5 participants
@coot @disassembler @dermetfan @Jimbo4350 @kevinhammond