Skip to content

Conversation

@kwvg
Copy link
Collaborator

@kwvg kwvg commented Jul 15, 2021

No description provided.

@kwvg kwvg marked this pull request as draft July 15, 2021 17:05
@github-actions
Copy link

This pull request has conflicts, please rebase.

@kwvg kwvg marked this pull request as ready for review September 14, 2021 16:09
Copy link
Member

@PastaPastaPasta PastaPastaPasta left a comment

Choose a reason for hiding this comment

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

utACK for merging via merge commit

For 21064, can we do https://github.com/bitcoin/bitcoin/pull/21064/files#diff-dac26d1a1b4a405373f40090c92278a64cbda24c875d3394d5e7f81747367702L70-L71? git grep doesn't yield any results

Also, does it make sense to remove the cxx17 ci build now?

@PastaPastaPasta PastaPastaPasta added this to the 18 milestone Sep 14, 2021
Copy link

@UdjinM6 UdjinM6 left a comment

Choose a reason for hiding this comment

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

  1. agree with @PastaPastaPasta - we should drop linux64_cxx17 build (should we add --with-sanitizers=undefined to linux64 build?)
  2. should apply 20471 to depends/packages/protobuf.mk

@kwvg
Copy link
Collaborator Author

kwvg commented Sep 15, 2021

@PastaPastaPasta, we could remove those two lines from the inter whitelist but they're not there to begin with so there's nothing to remove (which is kinda surprising but not too problematic)

@UdjinM6, bitcoin#20471 has been updated and linux64_cxx17 has been dropped

UdjinM6
UdjinM6 previously approved these changes Sep 15, 2021
Copy link

@UdjinM6 UdjinM6 left a comment

Choose a reason for hiding this comment

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

utACK

ci/matrix.sh Outdated
Copy link
Member

Choose a reason for hiding this comment

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

Hmmmm, we shouldn't just do this b/c of --enable-werror --with-sanitizers=undefined which are not on linux64/32

Also the fact that this one doesn't do functional tests. We should probably keep this, but just rename it to be like linux64_nofun :D

@PastaPastaPasta
Copy link
Member

(Otherwise everything does good)

@UdjinM6
Copy link

UdjinM6 commented Sep 16, 2021

CI is broken:

Let's maybe drop 63f0fc4 for now and implement it in a separate PR?

@PastaPastaPasta
Copy link
Member

Let's maybe drop 63f0fc4 for now and implement it in a separate PR?

If we drop 63f0fc4, we should drop kwvg@73de8a6 as well

@kwvg
Copy link
Collaborator Author

kwvg commented Sep 17, 2021

Updated with rollbacks

Copy link
Member

@PastaPastaPasta PastaPastaPasta left a comment

Choose a reason for hiding this comment

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

utACK for merging via merge commit

@kwvg kwvg requested a review from UdjinM6 September 18, 2021 11:33
Copy link

@UdjinM6 UdjinM6 left a comment

Choose a reason for hiding this comment

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

Not a huge fan of merging PRs with failed CI builds but these failures are unrelated, so

utACK

@UdjinM6 UdjinM6 merged commit f54210a into dashpay:develop Sep 18, 2021
@kwvg kwvg deleted the cxx17support branch July 18, 2023 11:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants