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.

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

[DEVOPS-998] bump cardano-sl to HEAD of 1.3.1 #1052

Merged
merged 1 commit into from
Aug 24, 2018

Conversation

disassembler
Copy link
Contributor

@disassembler disassembler commented Aug 17, 2018

This PR bumps cardano-sl version to HEAD of 1.3.1 branch.

Copy link
Contributor

@rvl rvl left a comment

Choose a reason for hiding this comment

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

Looks like 1.3.1

@nikolaglumac
Copy link
Contributor

@disassembler @rvl what about this PR? We need to bump Cardano version to 1.3.1 but I am unsure how that impacts this fix: https://github.com/input-output-hk/daedalus/pull/1053/files#diff-0ee4d45dac8c62d2f085f5b5de593312 (@cleverca22 updated the launcher code in that PR and thus we had to use the correct Cardano revision)

@rvl
Copy link
Contributor

rvl commented Aug 22, 2018

This conflicts because the Daedalus release branch cardano-sl version has been changed to point at a PR branch: input-output-hk/cardano-sl#3421.

Once that gets merged, this PR should be updated to use the latest revision from the release/1.3.1 branch.

Setting this to WIP/DO NOT MERGE in the meantime.

@rvl rvl changed the title bump cardano-sl to HEAD of 1.3.1 WIP [DEVOPS-998] bump cardano-sl to HEAD of 1.3.1 Aug 22, 2018
@nikolaglumac
Copy link
Contributor

Thanks for the info @rvl!
Who will take care of these two actions? (merging and updating this PR?)

@rvl
Copy link
Contributor

rvl commented Aug 22, 2018

@disassembler @cleverca22

@rvl rvl force-pushed the release-1.3.1-cardano-bump branch 2 times, most recently from 6e2cdfa to db4793b Compare August 24, 2018 04:14
@rvl rvl force-pushed the release-1.3.1-cardano-bump branch from db4793b to 40754ac Compare August 24, 2018 04:18
@rvl rvl changed the title WIP [DEVOPS-998] bump cardano-sl to HEAD of 1.3.1 [DEVOPS-998] bump cardano-sl to HEAD of 1.3.1 Aug 24, 2018
@rvl rvl merged commit 9061456 into release/0.11.1 Aug 24, 2018
@rvl rvl deleted the release-1.3.1-cardano-bump branch August 24, 2018 04:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants