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 8.9.4 #5888

Merged
merged 2 commits into from
Jun 27, 2024
Merged

Release 8.9.4 #5888

merged 2 commits into from
Jun 27, 2024

Conversation

amesgen
Copy link
Member

@amesgen amesgen commented Jun 27, 2024

Description

Integrating IntersectMBO/ouroboros-consensus#1167

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
Release 8.9.4
e2ceaea
@amesgen
locli: add cardano-prelude < 0.2 constraint
23a7146 
Otherwise:

src/Cardano/Analysis/API/Ground.hs:58:13: error:
    Ambiguous occurrence ‘toText’
    It could refer to
       either ‘Cardano.Prelude.toText’,
              imported from ‘Cardano.Prelude’ at src/Cardano/Analysis/API/Ground.hs:14:1-53
              (and originally defined in ‘cardano-prelude-0.2.0.0:Cardano.Prelude.ConvertText’)
           or ‘Data.Text.Short.toText’,
              imported from ‘Data.Text.Short’ at src/Cardano/Analysis/API/Ground.hs:25:63-68
              (and originally defined in ‘text-short-0.1.5:Data.Text.Short.Internal’)
   |
58 | shortHash = toText . SText.take 6 . unHash
   |             ^^^^^^
@amesgen amesgen marked this pull request as ready for review June 27, 2024 15:14
@amesgen amesgen requested review from a team as code owners June 27, 2024 15:14
@disassembler disassembler merged commit 8ac5f75 into release/8.9.x Jun 27, 2024
19 of 38 checks passed
@disassembler disassembler deleted the amesgen/node-8.9.4 branch June 27, 2024 16:01
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

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

Successfully merging this pull request may close these issues.
2 participants
@amesgen @disassembler