Skip to content

Commit 0bc24d9

Browse files
stevenroosestevenroose
committed
Merge #1018: ci: a bunch more backports to get MacOS job working
1e63e57 ci: disable Werror on MacOS build (not a backport) (Andrew Poelstra) 1852f83 ci: Bump macOS image to big-sur-xcode-12.5 (MarcoFalke) 4f33ba7 ci: Fix macOS brew install command (Hennadii Stepanov) 0265085 ci: Bump macOS VM image to the latest version (Hennadii Stepanov) 0740cee ci: Adjust cirrus ci task names (Andrew Poelstra) d08e584 ci: Fix doc typos in .cirrus.yml (Andrew Poelstra) 953cbe2 ci: Run nowallet ci config on cirrus (MarcoFalke) 60a5632 build: set minimum supported macOS to 10.14 (fanquake) Pull request description: 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. Top commit has no ACKs. Tree-SHA512: cdfe96789adedbfb617cdafb534175323a8fd46606e67adf7053f97cc32712dd3ece850906b522b6b0bed137f52c1372319f52f4a7b303aec479ea54d213271c
2 parents aad04d0 + 1e63e57 commit 0bc24d9

File tree

10 files changed

+34
-31
lines changed

10 files changed

+34
-31
lines changed

‎.cirrus.yml‎

Lines changed: 21 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -56,31 +56,31 @@ global_task_template: &GLOBAL_TASK_TEMPLATE
5656
# - choco install python --version=3.7.7 -y
5757

5858
task:
59-
name: 'ARM [GOAL: install] [buster] [unit tests, no functional tests]'
59+
name: 'ARM [unit tests, no functional tests] [buster]'
6060
<< : *GLOBAL_TASK_TEMPLATE
6161
container:
6262
image: debian:buster
6363
env:
6464
FILE_ENV: "./ci/test/00_setup_env_arm.sh"
6565

6666
task:
67-
name: 'Win64 [GOAL: deploy] [unit tests, no gui, no boost::process, no functional tests]'
67+
name: 'Win64 [unit tests, no gui tests, no boost::process, no functional tests] [bionic]'
6868
<< : *GLOBAL_TASK_TEMPLATE
6969
container:
7070
image: ubuntu:bionic
7171
env:
7272
FILE_ENV: "./ci/test/00_setup_env_win64.sh"
7373

7474
task:
75-
name: 'x86_64 Linux [GOAL: install] [bionic] [C++17, previous releases, uses qt5 dev package and some depends packages] [unsigned char]'
75+
name: '[previous releases, uses qt5 dev package and some depends packages] [unsigned char] [bionic]'
7676
<< : *GLOBAL_TASK_TEMPLATE
7777
container:
7878
image: ubuntu:bionic
7979
env:
8080
FILE_ENV: "./ci/test/00_setup_env_native_qt5.sh"
8181

8282
task:
83-
name: 'x86_64 Linux [GOAL: install] [focal] [depends, sanitizers: thread (TSan), no gui]'
83+
name: '[depends, sanitizers: thread (TSan), no gui] [focal]'
8484
<< : *GLOBAL_TASK_TEMPLATE
8585
container:
8686
image: ubuntu:focal
@@ -91,15 +91,15 @@ task:
9191
FILE_ENV: "./ci/test/00_setup_env_native_tsan.sh"
9292

9393
task:
94-
name: 'x86_64 Linux [GOAL: install] [focal] [depends, sanitizers: memory (MSan)]'
94+
name: '[depends, sanitizers: memory (MSan)] [focal]'
9595
<< : *GLOBAL_TASK_TEMPLATE
9696
container:
9797
image: ubuntu:focal
9898
env:
9999
FILE_ENV: "./ci/test/00_setup_env_native_msan.sh"
100100

101101
task:
102-
name: 'x86_64 Linux [GOAL: install] [focal] [no depends, only system libs, sanitizers: address/leak (ASan + LSan) + undefined (UBSan) + integer]'
102+
name: '[no depends, only system libs, sanitizers: address/leak (ASan + LSan) + undefined (UBSan) + integer] [focal]'
103103
<< : *GLOBAL_TASK_TEMPLATE
104104
container:
105105
image: ubuntu:focal
@@ -109,7 +109,7 @@ task:
109109
FILE_ENV: "./ci/test/00_setup_env_native_asan.sh"
110110

111111
task:
112-
name: 'x86_64 Linux [GOAL: install] [focal] [no depends, only system libs, sanitizers: fuzzer,address,undefined]'
112+
name: '[no depends, only system libs, sanitizers: fuzzer,address,undefined] [focal]'
113113
<< : *GLOBAL_TASK_TEMPLATE
114114
container:
115115
image: ubuntu:focal
@@ -119,29 +119,37 @@ task:
119119
FILE_ENV: "./ci/test/00_setup_env_native_fuzz.sh"
120120

121121
task:
122-
name: 'x86_64 Linux [GOAL: install] [focal] [multiprocess]'
122+
name: '[multiprocess] [focal]'
123123
<< : *GLOBAL_TASK_TEMPLATE
124124
container:
125125
image: ubuntu:focal
126126
env:
127127
FILE_ENV: "./ci/test/00_setup_env_native_multiprocess.sh"
128128

129129
task:
130-
name: 'macOS 10.12 [GOAL: deploy] [no functional tests]'
130+
name: '[no wallet] [bionic]'
131+
<< : *GLOBAL_TASK_TEMPLATE
132+
container:
133+
image: ubuntu:bionic
134+
env:
135+
FILE_ENV: "./ci/test/00_setup_env_native_nowallet.sh"
136+
137+
task:
138+
name: 'macOS 10.14 [gui, no tests] [bionic]'
131139
<< : *GLOBAL_TASK_TEMPLATE
132140
container:
133141
image: ubuntu:bionic
134142
env:
135143
FILE_ENV: "./ci/test/00_setup_env_mac.sh"
136144

137145
task:
138-
name: 'macOS 10.14 native [GOAL: install] [GUI] [no depends]'
139-
macos_brew_addon_script:
140-
- brew install boost libevent berkeley-db4 qt miniupnpc ccache zeromq qrencode sqlite libtool automake pkg-config gnu-getopt
146+
name: 'macOS 11 native [gui] [no depends]'
147+
brew_install_script:
148+
- brew install boost libevent berkeley-db4 qt@5 miniupnpc ccache zeromq qrencode sqlite libtool automake pkg-config gnu-getopt
141149
<< : *GLOBAL_TASK_TEMPLATE
142150
osx_instance:
143151
# Use latest image, but hardcode version to avoid silent upgrades (and breaks)
144-
image: catalina-xcode-12.1 # https://cirrus-ci.org/guide/macOS
152+
image: big-sur-xcode-12.5 # https://cirrus-ci.org/guide/macOS
145153
env:
146154
DANGER_RUN_CI_ON_HOST: "true"
147155
CI_USE_APT_INSTALL: "no"

‎.travis.yml‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -65,13 +65,7 @@ jobs:
6565
script:
6666
- set -o errexit; source ./ci/lint/06_script.sh
6767

68-
# Disabled due to new Travis restrictions; will be removed as part of 0.22 rebase
69-
# - stage: test
70-
# name: '32-bit + dash [GOAL: install] [CentOS 7] [gui]'
71-
# env: >-
72-
# FILE_ENV="./ci/test/00_setup_env_i686_centos.sh"
73-
7468
- stage: test
75-
name: 'x86_64 Linux [GOAL: install] [xenial] [no wallet]'
69+
name: '32-bit + dash [GOAL: install] [CentOS 8] [gui]'
7670
env: >-
77-
FILE_ENV="./ci/test/00_setup_env_native_nowallet.sh"
71+
FILE_ENV="./ci/test/00_setup_env_i686_centos.sh"

‎ci/test/00_setup_env_mac.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ export LC_ALL=C.UTF-8
88

99
export CONTAINER_NAME=ci_macos_cross
1010
export DOCKER_NAME_TAG=ubuntu:18.04 # Check that bionic can cross-compile to macos (bionic is used in the gitian build as well)
11-
export HOST=x86_64-apple-darwin16
11+
export HOST=x86_64-apple-darwin18
1212
export PACKAGES="cmake imagemagick libcap-dev librsvg2-bin libz-dev libbz2-dev libtiff-tools python3-dev python3-setuptools"
1313
export XCODE_VERSION=11.3.1
1414
export XCODE_BUILD_ID=11C505

‎ci/test/00_setup_env_mac_host.sh‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,12 @@
66

77
export LC_ALL=C.UTF-8
88

9-
export HOST=x86_64-apple-darwin16
9+
export HOST=x86_64-apple-darwin18
1010
export PIP_PACKAGES="zmq"
1111
export GOAL="install"
1212
# ELEMENTS: add -fno-stack-check to work around clang bug on macos
13-
export BITCOIN_CONFIG="--with-gui --enable-reduce-exports --enable-werror --with-boost-process CXXFLAGS=-fno-stack-check"
13+
# ELEMENTS: remove --enable-werror because it triggers on Boost Thread includes (FIXME remove this after 22.0 rebase when boost-thread is removed)
14+
export BITCOIN_CONFIG="--with-gui --enable-reduce-exports --with-boost-process CXXFLAGS=-fno-stack-check"
1415
export CI_OS_NAME="macos"
1516
export NO_DEPENDS=1
1617
export OSX_SDK=""

‎contrib/gitian-descriptors/gitian-osx.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ script: |
3939
set -e -o pipefail
4040
4141
WRAP_DIR=$HOME/wrapped
42-
HOSTS="x86_64-apple-darwin16"
42+
HOSTS="x86_64-apple-darwin18"
4343
CONFIGFLAGS="--enable-reduce-exports --disable-bench --disable-gui-tests GENISOIMAGE=$WRAP_DIR/genisoimage"
4444
FAKETIME_HOST_PROGS=""
4545
FAKETIME_PROGS="ar ranlib date dmg genisoimage"

‎depends/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Common `host-platform-triplets` for cross compilation are:
2525
- `i686-pc-linux-gnu` for Linux 32 bit
2626
- `x86_64-pc-linux-gnu` for x86 Linux
2727
- `x86_64-w64-mingw32` for Win64
28-
- `x86_64-apple-darwin16` for macOS
28+
- `x86_64-apple-darwin18` for macOS
2929
- `arm-linux-gnueabihf` for Linux ARM 32 bit
3030
- `aarch64-linux-gnu` for Linux ARM 64 bit
3131
- `powerpc64-linux-gnu` for Linux POWER 64-bit (big endian)

‎depends/hosts/darwin.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
OSX_MIN_VERSION=10.12
1+
OSX_MIN_VERSION=10.14
22
OSX_SDK_VERSION=10.15.1
33
XCODE_VERSION=11.3.1
44
XCODE_BUILD_ID=11C505

‎doc/build-osx.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,6 @@ tail -f $HOME/Library/Application\ Support/Bitcoin/debug.log
111111
```
112112

113113
## Notes
114-
* Tested on OS X 10.12 Sierra through macOS 10.15 Catalina on 64-bit Intel
114+
* Tested on OS X 10.14 Mojave through macOS 11 Big Sur on 64-bit Intel
115115
processors only.
116116
* Building with downloaded Qt binaries is not officially supported. See the notes in [#7714](https://github.com/bitcoin/bitcoin/issues/7714).

‎doc/release-notes.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,12 @@ with the 0.22.0 release. This means that a compiler that supports C++17 will be
5151
required to compile 0.22.0.
5252

5353
Bitcoin Core is supported and extensively tested on operating systems
54-
using the Linux kernel, macOS 10.12+, and Windows 7 and newer. Bitcoin
54+
using the Linux kernel, macOS 10.14+, and Windows 7 and newer. Bitcoin
5555
Core should also work on most other Unix-like systems but is not as
5656
frequently tested on them. It is not recommended to use Bitcoin Core on
5757
unsupported systems.
5858

59-
From Bitcoin Core 0.20.0 onwards, macOS versions earlier than 10.12 are no
59+
From Bitcoin Core 0.22.0 onwards, macOS versions earlier than 10.14 are no
6060
longer supported. Additionally, Bitcoin Core does not yet change appearance
6161
when macOS "dark mode" is activated.
6262

‎share/qt/Info.plist.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<plist version="0.9">
44
<dict>
55
<key>LSMinimumSystemVersion</key>
6-
<string>10.12.0</string>
6+
<string>10.14.0</string>
77

88
<key>LSArchitecturePriority</key>
99
<array>

0 commit comments

Comments
 (0)