change windows CI to Focal

gridcoin-community · Apr 6, 2022 · f581ce2 · f581ce2
1 parent a6bde68
commit f581ce2
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/ci/test/00_setup_env_win32.sh b/ci/test/00_setup_env_win32.sh
@@ -7,7 +7,7 @@
 export LC_ALL=C.UTF-8
 
 export CONTAINER_NAME=ci_win32
-export DOCKER_NAME_TAG=ubuntu:18.04  # Check that bionic can cross-compile to win32
+export DOCKER_NAME_TAG=ubuntu:20.04  # Check that focal can cross-compile to win32
 export HOST=i686-w64-mingw32
 export PACKAGES="python3 nsis g++-mingw-w64-i686 wine-binfmt wine32"
 export RUN_UNIT_TESTS=true

diff --git a/ci/test/00_setup_env_win64.sh b/ci/test/00_setup_env_win64.sh
@@ -7,9 +7,10 @@
 export LC_ALL=C.UTF-8
 
 export CONTAINER_NAME=ci_win64
-export DOCKER_NAME_TAG=ubuntu:18.04  # Check that bionic can cross-compile to win64
+export DOCKER_NAME_TAG=ubuntu:20.04  # Check that focal can cross-compile to win64
 export HOST=x86_64-w64-mingw32
-export PACKAGES="python3 nsis g++-mingw-w64-x86-64 wine-binfmt wine64"
+export DPKG_ADD_ARCH="i386"
+export PACKAGES="python3 nsis g++-mingw-w64-x86-64 wine-binfmt wine64 wine32 file"
 export GOAL=""
 export GRIDCOIN_CONFIG="--enable-reduce-exports --with-gui=qt5"
 export NEED_XVFB="true"
diff --git 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