ci: a bunch more backports to get MacOS job working #1018
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
f8d0931 to
8b2f72c
Compare
Details: Homebrew/discussions#691 bitcoin/bitcoin#21663 (1/1) Conflicts: .cirrus.yml; had to remove libnatpnp which was added upstream in bitcoin/bitcoin#18077 which is a much larger PR that we are NOT backporting.
This also removes the "brew update" added in commit b738155. bitcoin/bitcoin#22122 (1/1)
8b2f72c to
1e63e57
Compare
|
We actually need both this and #1017 to get CI working. |
stevenroose
reviewed
Jul 12, 2021
| @@ -10,7 +10,8 @@ export HOST=x86_64-apple-darwin18 | |||
| export PIP_PACKAGES="zmq" | |||
| export GOAL="install" | |||
| # ELEMENTS: add -fno-stack-check to work around clang bug on macos | |||
| export BITCOIN_CONFIG="--with-gui --enable-reduce-exports --enable-werror --with-boost-process CXXFLAGS=-fno-stack-check" | |||
| # ELEMENTS: remove --enable-werror because it triggers on Boost Thread includes (FIXME remove this after 22.0 rebase when boost-thread is removed) | |||
There was a problem hiding this comment.
Remembering this will be a non-trivial task 😅
There was a problem hiding this comment.
In the 22 rebase I just blanked out this PR, since the PRs it backports preceded it.
|
LGTM, I'm not fully understanding the OSX changes specifically, but the CI changes seem fine and I didn't see any other potential side-effects. |
|
utACK 1e63e57 |
gwillen
pushed a commit
that referenced
this pull request
Jun 1, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Backport of bitcoin/bitcoin#20419 then bitcoin/bitcoin#19179 (except 2nd commit "Run i686 centos ci config on cirrus" which requires some more supporting PRs) then bitcoin/bitcoin#20545 then bitcoin/bitcoin#21542 then
bitcoin/bitcoin#21663 then bitcoin/bitcoin#22122
We are getting 403 errors in our MacOS job on Cirrus, presumably because bintray.com has shut down (see discussion on upstream PR 21663). Backport this PR and several supporting ones. These PRs will be merged as part of the 22.0 rebase. In the interest of keeping CI running let's backport them early.