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

Update to latest consensus release #392

Merged
merged 1 commit into from Nov 30, 2023
Merged

Update to latest consensus release #392

merged 1 commit into from Nov 30, 2023

Conversation

jasagredo
Copy link
Contributor

@jasagredo jasagredo commented Nov 30, 2023 •
edited

Changelog

- description: |
    Update to latest `ouroboros-consensus`
    Allow `text-1` for cross compilation on GHC 8.10.7 for aarch64-darwin
# uncomment types applicable to the change:
  type:
  # - feature        # introduces a new feature
  # - breaking       # the API has changed in a breaking way
  # - compatible     # the API has changed but is non-breaking
  # - optimisation   # measurable performance improvements
  # - improvement    # QoL changes e.g. refactoring
  # - bugfix         # fixes a defect
  # - test           # fixes/modifies tests
  # - maintenance    # not directly related to the code
  - release        # related to a new release preparation
  # - documentation  # change in code docs, haddocks...

Context

How to trust this PR

Checklist

  • Commit sequence broadly makes sense and commits have useful messages
  • New tests are added if needed and existing tests are updated. See Running tests for more details
  • Self-reviewed the diff

@jasagredo jasagredo force-pushed the js/update-consensus branch 2 times, most recently from 4e6ecc1 to 7e55cb1 Compare November 30, 2023 15:27
@carbolymer carbolymer added this pull request to the merge queue Nov 30, 2023
Merged via the queue into main with commit a29d94d Nov 30, 2023
20 checks passed
@carbolymer carbolymer deleted the js/update-consensus branch November 30, 2023 17:59
michaelpj
michaelpj reviewed Nov 30, 2023
View reviewed changes
cardano-api/cardano-api.cabal
@@ -40,8 +40,14 @@ common maybe-Win32
if os(windows)
build-depends: Win32

common text
if impl(ghc == 8.10.7) && os(darwin) && arch(aarch64)
Copy link
Contributor

@michaelpj michaelpj Nov 30, 2023 •
edited

Choose a reason for hiding this comment

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

Surely this is worth a comment here too? Also I'm surprised this is different to the bound you put in consensus?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@michaelpj michaelpj michaelpj left review comments

@Jimbo4350 Jimbo4350 Jimbo4350 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

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

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

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

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

Successfully merging this pull request may close these issues.

None yet
4 participants
@jasagredo @michaelpj @Jimbo4350 @carbolymer