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

Integrate upstream libraries for 8.5 #5490

Merged
merged 4 commits into from
Oct 5, 2023
Merged

Integrate upstream libraries for 8.5 #5490

merged 4 commits into from
Oct 5, 2023

Conversation

amesgen
Copy link
Member

@amesgen amesgen commented Oct 2, 2023 •
edited

Description

Integrates:

  • cardano-ledger-conwa-1.9
  • ouroboros-consensus-0.12
  • ouroboros-consensus-cardano-0.10
  • cardano-api-8.25
  • cardano-cli-8.11

Checklist

  • Commit sequence broadly makes sense and commits have useful messages
  • New tests are added if needed and existing tests are updated. These may include:
    • golden tests
    • property tests
    • roundtrip tests
    • integration tests
      See Runnings tests for more details
  • Any changes are noted in the CHANGELOG.md for affected package
  • The version bounds in .cabal files are updated
  • CI passes. See note on CI. The following CI checks are required:
    • Code is linted with hlint. See .github/workflows/check-hlint.yml to get the hlint version
    • Code is formatted with stylish-haskell. See .github/workflows/stylish-haskell.yml to get the stylish-haskell version
    • Code builds on Linux, MacOS and Windows for ghc-8.10.7 and ghc-9.2.7
  • Self-reviewed the diff

Note on CI

If your PR is from a fork, the necessary CI jobs won't trigger automatically for security reasons.
You will need to get someone with write privileges. Please contact IOG node developers to do this
for you.

@amesgen amesgen changed the title Integrate upstream libraries for 8.5 (except cardano-cli for now) Integrate upstream libraries for 8.5 Oct 2, 2023
@amesgen amesgen self-assigned this Oct 2, 2023
@amesgen amesgen force-pushed the amesgen/releng-8.5 branch 5 times, most recently from ddf287d to b42234c Compare October 4, 2023 15:35
disassembler and others added 2 commits October 4, 2023 15:56
@disassembler
trace-dispatcher: bump version
d4a8628
@NadiaYvette
Haddock fixes
5955b72 
Fix over-indented haddock comment in the trace dispatcher.

Fix attempt to attach documentation to tuple components within a
function argument/result.
@disassembler disassembler marked this pull request as ready for review October 5, 2023 01:30
@disassembler disassembler requested review from a team as code owners October 5, 2023 01:30
angerman
angerman approved these changes Oct 5, 2023
View reviewed changes
Copy link
Contributor

@angerman angerman left a comment

Choose a reason for hiding this comment

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

Looks not too suspicious!

@disassembler disassembler added this pull request to the merge queue Oct 5, 2023
Merged via the queue into master with commit dbb13dc Oct 5, 2023
21 of 22 checks passed
@disassembler disassembler deleted the amesgen/releng-8.5 branch October 5, 2023 06:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@angerman angerman angerman approved these changes

Assignees

@amesgen amesgen

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@amesgen @angerman @disassembler @NadiaYvette