Skip to content

Commit 5baff2b

Browse files
committed
build: use focal in gitian descriptors
Compilers used change as follows: Linux native GCC 7.5 -> GCC 8.4 Linux cross GCC 8.4 -> GCC 8.4 Windows mingw-w64 7.3 -> mingw-w64 9.3 macOS Clang 8.0.0 -> Clang 8.0.0 The macOS and Win cross builds in the CI are updated to use Focal, and per the op, running the security tests is disabled in the Windows build.
1 parent ea96e17 commit 5baff2b

8 files changed

+15
-13
lines changed

Diff for: ci/test/00_setup_env_mac.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
export LC_ALL=C.UTF-8
88

99
export CONTAINER_NAME=ci_macos_cross
10-
export DOCKER_NAME_TAG=ubuntu:18.04 # Check that bionic can cross-compile to macos (bionic is used in the gitian build as well)
10+
export DOCKER_NAME_TAG=ubuntu:20.04 # Check that Focal can cross-compile to macos (Focal is used in the gitian build as well)
1111
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 xorriso"
1313
export XCODE_VERSION=11.3.1

Diff for: ci/test/00_setup_env_win64.sh

+1-2
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,10 @@
77
export LC_ALL=C.UTF-8
88

99
export CONTAINER_NAME=ci_win64
10-
export DOCKER_NAME_TAG=ubuntu:18.04 # Check that bionic can cross-compile to win64 (bionic is used in the gitian build as well)
10+
export DOCKER_NAME_TAG=ubuntu:20.04 # Check that Focal can cross-compile to win64 (Focal is used in the gitian build as well)
1111
export HOST=x86_64-w64-mingw32
1212
export PACKAGES="python3 nsis g++-mingw-w64-x86-64 wine-binfmt wine64 file"
1313
export RUN_FUNCTIONAL_TESTS=false
14-
export RUN_SECURITY_TESTS="true"
1514
export GOAL="deploy"
1615
export BITCOIN_CONFIG="--enable-reduce-exports --disable-gui-tests --without-boost-process"
1716

Diff for: contrib/gitian-build.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,14 @@ def setup():
3535
if not os.path.isdir('bitcoin'):
3636
subprocess.check_call(['git', 'clone', 'https://github.com/bitcoin/bitcoin.git'])
3737
os.chdir('gitian-builder')
38-
make_image_prog = ['bin/make-base-vm', '--suite', 'bionic', '--arch', 'amd64']
38+
make_image_prog = ['bin/make-base-vm', '--suite', 'focal', '--arch', 'amd64']
3939
if args.docker:
4040
make_image_prog += ['--docker']
4141
elif not args.kvm:
4242
make_image_prog += ['--lxc']
4343
subprocess.check_call(make_image_prog)
4444
os.chdir(workdir)
45-
if args.is_bionic and not args.kvm and not args.docker:
45+
if args.is_focal and not args.kvm and not args.docker:
4646
subprocess.check_call(['sudo', 'sed', '-i', 's/lxcbr0/br0/', '/etc/default/lxc-net'])
4747
print('Reboot is required')
4848
sys.exit(0)
@@ -176,7 +176,7 @@ def main():
176176
args = parser.parse_args()
177177
workdir = os.getcwd()
178178

179-
args.is_bionic = b'bionic' in subprocess.check_output(['lsb_release', '-cs'])
179+
args.is_focal = b'focal' in subprocess.check_output(['lsb_release', '-cs'])
180180

181181
if args.kvm and args.docker:
182182
raise Exception('Error: cannot have both kvm and docker')

Diff for: contrib/gitian-descriptors/gitian-linux.yml

+5-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: "bitcoin-core-linux-22"
33
enable_cache: true
44
distro: "ubuntu"
55
suites:
6-
- "bionic"
6+
- "focal"
77
architectures:
88
- "amd64"
99
packages:
@@ -15,6 +15,8 @@ packages:
1515
- "ca-certificates"
1616
- "curl"
1717
- "faketime"
18+
- "g++-8"
19+
- "gcc-8"
1820
- "git"
1921
- "libtool"
2022
- "patch"
@@ -107,7 +109,7 @@ script: |
107109
BASEPREFIX="${PWD}/depends"
108110
# Build dependencies for each host
109111
for i in $HOSTS; do
110-
make ${MAKEOPTS} -C ${BASEPREFIX} HOST="${i}"
112+
make ${MAKEOPTS} -C ${BASEPREFIX} HOST="${i}" CC=${i}-gcc-8 CXX=${i}-g++-8
111113
done
112114
113115
# Faketime for binaries
@@ -144,7 +146,7 @@ script: |
144146
tar --strip-components=1 -xf "${GIT_ARCHIVE}"
145147
146148
./autogen.sh
147-
CONFIG_SITE=${BASEPREFIX}/${i}/share/config.site ./configure --prefix=/ --disable-ccache --disable-maintainer-mode --disable-dependency-tracking ${CONFIGFLAGS} CFLAGS="${HOST_CFLAGS}" CXXFLAGS="${HOST_CXXFLAGS}" LDFLAGS="${HOST_LDFLAGS}"
149+
CONFIG_SITE=${BASEPREFIX}/${i}/share/config.site ./configure --prefix=/ --disable-ccache --disable-maintainer-mode --disable-dependency-tracking ${CONFIGFLAGS} CFLAGS="${HOST_CFLAGS}" CXXFLAGS="${HOST_CXXFLAGS}" LDFLAGS="${HOST_LDFLAGS}" CC=${i}-gcc-8 CXX=${i}-g++-8
148150
make ${MAKEOPTS}
149151
make ${MAKEOPTS} -C src check-security
150152
make ${MAKEOPTS} -C src check-symbols

Diff for: contrib/gitian-descriptors/gitian-osx-signer.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
name: "bitcoin-dmg-signer"
33
distro: "ubuntu"
44
suites:
5-
- "bionic"
5+
- "focal"
66
architectures:
77
- "amd64"
88
packages:

Diff for: contrib/gitian-descriptors/gitian-osx.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: "bitcoin-core-osx-22"
33
enable_cache: true
44
distro: "ubuntu"
55
suites:
6-
- "bionic"
6+
- "focal"
77
architectures:
88
- "amd64"
99
packages:
@@ -29,6 +29,7 @@ packages:
2929
- "python3-setuptools"
3030
- "fonts-tuffy"
3131
- "xorriso"
32+
- "libtinfo5"
3233
remotes:
3334
- "url": "https://github.com/bitcoin/bitcoin.git"
3435
"dir": "bitcoin"

Diff for: contrib/gitian-descriptors/gitian-win-signer.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
name: "bitcoin-win-signer"
33
distro: "ubuntu"
44
suites:
5-
- "bionic"
5+
- "focal"
66
architectures:
77
- "amd64"
88
packages:

Diff for: contrib/gitian-descriptors/gitian-win.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: "bitcoin-core-win-22"
33
enable_cache: true
44
distro: "ubuntu"
55
suites:
6-
- "bionic"
6+
- "focal"
77
architectures:
88
- "amd64"
99
packages:

0 commit comments

Comments
 (0)