diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2021-02-09 13:47:53 +0100 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2021-02-09 21:37:14 +0100 |
| commit | fa272dfdff711e324baefc9bdbb2bf4b52d99eb0 (patch) | |
| tree | 0ea7b191c4c8ba2defdb7c3df817cd1d89938e7f /ci | |
| parent | 3641ec1aacfe9a06d1e3f89875c0d0828639c4c2 (diff) | |
| download | bitcoin-fa272dfdff711e324baefc9bdbb2bf4b52d99eb0.tar.xz | |
ci: Properly bump to focal for win cross build
Diffstat (limited to 'ci')
| -rw-r--r-- | ci/test/00_setup_env_win64.sh | 3 | ||||
| -rwxr-xr-x | ci/test/wrap-wine.sh | 4 |
2 files changed, 5 insertions, 2 deletions
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 |