diff options
| author | fanquake <fanquake@gmail.com> | 2021-02-10 09:13:10 +0800 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2021-02-10 09:40:44 +0800 |
| commit | 09530b0255aba083bf168322a95b89cc387e616f (patch) | |
| tree | 02bd3f9a9f4e64f9b2e4439240db2c32662f6c89 | |
| parent | d202054675c91b353d832c9c038247384a39030f (diff) | |
| parent | fa272dfdff711e324baefc9bdbb2bf4b52d99eb0 (diff) | |
| download | bitcoin-09530b0255aba083bf168322a95b89cc387e616f.tar.xz | |
Merge #21126: ci: Properly bump to focal for win cross build
fa272dfdff711e324baefc9bdbb2bf4b52d99eb0 ci: Properly bump to focal for win cross build (MarcoFalke)
Pull request description:
Fixes #21122
ACKs for top commit:
fanquake:
ACK fa272dfdff711e324baefc9bdbb2bf4b52d99eb0 - Looks good to me. I can see the wine version output, `wine-5.0 (Ubuntu 5.0-3ubuntu1)`, in the [log](https://cirrus-ci.com/task/5743559502462976), and `make check` is running.
Tree-SHA512: cd37462afc5512e00cef5e9e7fd1bb5c43c600e833b30cdea2c1c443dc7b0e68f5f2cbaf9d7b655892059af0a226478211db1dc97c10fe4dcdfe666a784f3afc
| -rw-r--r-- | .cirrus.yml | 4 | ||||
| -rw-r--r-- | ci/test/00_setup_env_win64.sh | 3 | ||||
| -rwxr-xr-x | ci/test/wrap-wine.sh | 4 |
3 files changed, 7 insertions, 4 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index 1eabca1b8b..691582239e 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -82,10 +82,10 @@ task: FILE_ENV: "./ci/test/00_setup_env_arm.sh" task: - name: 'Win64 [unit tests, no gui tests, no boost::process, no functional tests] [bionic]' + name: 'Win64 [unit tests, no gui tests, no boost::process, no functional tests] [focal]' << : *GLOBAL_TASK_TEMPLATE container: - image: ubuntu:bionic + image: ubuntu:focal env: FILE_ENV: "./ci/test/00_setup_env_win64.sh" diff --git a/ci/test/00_setup_env_win64.sh b/ci/test/00_setup_env_win64.sh index 73bcffa0eb..3eea0a4565 100644 --- a/ci/test/00_setup_env_win64.sh +++ b/ci/test/00_setup_env_win64.sh @@ -9,7 +9,8 @@ export LC_ALL=C.UTF-8 export CONTAINER_NAME=ci_win64 export DOCKER_NAME_TAG=ubuntu:20.04 # Check that Focal can cross-compile to win64 (Focal is used in the gitian build as well) export HOST=x86_64-w64-mingw32 -export PACKAGES="python3 nsis g++-mingw-w64-x86-64 wine-binfmt wine64 file" +export DPKG_ADD_ARCH="i386" +export PACKAGES="python3 nsis g++-mingw-w64-x86-64 wine-binfmt wine64 wine32 file" export RUN_FUNCTIONAL_TESTS=false export GOAL="deploy" export BITCOIN_CONFIG="--enable-reduce-exports --disable-fuzz-binary --disable-gui-tests --without-boost-process" diff --git a/ci/test/wrap-wine.sh b/ci/test/wrap-wine.sh index 58a8983e6e..5c2eae2dd6 100755 --- a/ci/test/wrap-wine.sh +++ b/ci/test/wrap-wine.sh @@ -6,6 +6,8 @@ export LC_ALL=C.UTF-8 +wine --version + for b_name in {"${BASE_OUTDIR}/bin"/*,src/secp256k1/*tests,src/univalue/{no_nul,test_json,unitester,object}}.exe; do # shellcheck disable=SC2044 for b in $(find "${BASE_ROOT_DIR}" -executable -type f -name "$(basename $b_name)"); do @@ -13,7 +15,7 @@ for b_name in {"${BASE_OUTDIR}/bin"/*,src/secp256k1/*tests,src/univalue/{no_nul, echo "Wrap $b ..." mv "$b" "${b}_orig" echo '#!/usr/bin/env bash' > "$b" - echo "wine64 \"${b}_orig\" \"\$@\"" >> "$b" + echo "wine \"${b}_orig\" \"\$@\"" >> "$b" chmod +x "$b" fi done |