diff options
author | fanquake <fanquake@gmail.com> | 2021-01-29 09:48:05 +0800 |
---|---|---|
committer | fanquake <fanquake@gmail.com> | 2021-02-03 21:39:54 +0800 |
commit | 5baff2b31840bdbc465f55b875aa6e9480288215 (patch) | |
tree | c87164b9e1d5e8c2e7f60921ee8496e54e4891af /contrib/gitian-build.py | |
parent | ea96e17e1f2c2b0a949366260906ef02e560a425 (diff) | |
download | bitcoin-5baff2b31840bdbc465f55b875aa6e9480288215.tar.xz |
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.
Diffstat (limited to 'contrib/gitian-build.py')
-rwxr-xr-x | contrib/gitian-build.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/contrib/gitian-build.py b/contrib/gitian-build.py index 06b15574a7..0facf07948 100755 --- a/contrib/gitian-build.py +++ b/contrib/gitian-build.py @@ -35,14 +35,14 @@ def setup(): if not os.path.isdir('bitcoin'): subprocess.check_call(['git', 'clone', 'https://github.com/bitcoin/bitcoin.git']) os.chdir('gitian-builder') - make_image_prog = ['bin/make-base-vm', '--suite', 'bionic', '--arch', 'amd64'] + make_image_prog = ['bin/make-base-vm', '--suite', 'focal', '--arch', 'amd64'] if args.docker: make_image_prog += ['--docker'] elif not args.kvm: make_image_prog += ['--lxc'] subprocess.check_call(make_image_prog) os.chdir(workdir) - if args.is_bionic and not args.kvm and not args.docker: + if args.is_focal and not args.kvm and not args.docker: subprocess.check_call(['sudo', 'sed', '-i', 's/lxcbr0/br0/', '/etc/default/lxc-net']) print('Reboot is required') sys.exit(0) @@ -176,7 +176,7 @@ def main(): args = parser.parse_args() workdir = os.getcwd() - args.is_bionic = b'bionic' in subprocess.check_output(['lsb_release', '-cs']) + args.is_focal = b'focal' in subprocess.check_output(['lsb_release', '-cs']) if args.kvm and args.docker: raise Exception('Error: cannot have both kvm and docker') |