mirror of
https://github.com/Retropex/bitcoin.git
synced 2025-08-06 06:54:49 +02:00
ci: use Ubuntu Focal for macOS cross build
This commit is contained in:
parent
d864696649
commit
ac24af453d
@ -160,10 +160,10 @@ task:
|
|||||||
FILE_ENV: "./ci/test/00_setup_env_native_nowallet.sh"
|
FILE_ENV: "./ci/test/00_setup_env_native_nowallet.sh"
|
||||||
|
|
||||||
task:
|
task:
|
||||||
name: 'macOS 10.14 [gui, no tests] [bionic]'
|
name: 'macOS 10.14 [gui, no tests] [focal]'
|
||||||
<< : *GLOBAL_TASK_TEMPLATE
|
<< : *GLOBAL_TASK_TEMPLATE
|
||||||
container:
|
container:
|
||||||
image: ubuntu:bionic
|
image: ubuntu:focal
|
||||||
env:
|
env:
|
||||||
FILE_ENV: "./ci/test/00_setup_env_mac.sh"
|
FILE_ENV: "./ci/test/00_setup_env_mac.sh"
|
||||||
|
|
||||||
|
@ -9,7 +9,7 @@ export LC_ALL=C.UTF-8
|
|||||||
export CONTAINER_NAME=ci_macos_cross
|
export CONTAINER_NAME=ci_macos_cross
|
||||||
export DOCKER_NAME_TAG=ubuntu:20.04 # Check that Focal can cross-compile to macos (Focal is used in the gitian build as well)
|
export DOCKER_NAME_TAG=ubuntu:20.04 # Check that Focal can cross-compile to macos (Focal is used in the gitian build as well)
|
||||||
export HOST=x86_64-apple-darwin18
|
export HOST=x86_64-apple-darwin18
|
||||||
export PACKAGES="cmake imagemagick libcap-dev librsvg2-bin libz-dev libbz2-dev libtiff-tools python3-dev python3-setuptools xorriso"
|
export PACKAGES="cmake imagemagick libcap-dev librsvg2-bin libz-dev libbz2-dev libtiff-tools libtinfo5 python3-dev python3-setuptools xorriso"
|
||||||
export XCODE_VERSION=11.3.1
|
export XCODE_VERSION=11.3.1
|
||||||
export XCODE_BUILD_ID=11C505
|
export XCODE_BUILD_ID=11C505
|
||||||
export RUN_UNIT_TESTS=false
|
export RUN_UNIT_TESTS=false
|
||||||
|
Loading…
Reference in New Issue
Block a user