From 4328e81dde1bd2d4d0b8ff88b2312b2f8e6e0105 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Fri, 27 Aug 2021 21:46:49 +0200 Subject: [PATCH 1/3] Install 32 bit OpenGL libraries explicitly in the CI workflow For some reason 32 bit libgl1 is not pulled in as win32 dependency any more, resulting in errors when running the test using Direct2D. Fix this by installing the package explicitly. --- .github/workflows/ci_msw_cross.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci_msw_cross.yml b/.github/workflows/ci_msw_cross.yml index 993d8f7696..b0a093d064 100644 --- a/.github/workflows/ci_msw_cross.yml +++ b/.github/workflows/ci_msw_cross.yml @@ -106,7 +106,7 @@ jobs: i686-w64-mingw32) sudo dpkg --add-architecture i386 sudo apt-get -q -o=Dpkg::Use-Pty=0 update - packages="$packages g++-mingw-w64-i686 wine32" + packages="$packages g++-mingw-w64-i686 wine32 libgl1:i386" winerun=wine ;; From 16ae31b0da2f9f896ec4061432066f6aace61cec Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Fri, 27 Aug 2021 23:02:10 +0200 Subject: [PATCH 2/3] Fix setting DEBIAN_FRONTEND for apt-get install Do it in the command executed by sudo, as sudo doesn't propagate the environment variable values by default (--preserve-env option could be used to do it, but it's simpler to avoid it). --- .github/workflows/ci_msw_cross.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/ci_msw_cross.yml b/.github/workflows/ci_msw_cross.yml index b0a093d064..a96459ba0b 100644 --- a/.github/workflows/ci_msw_cross.yml +++ b/.github/workflows/ci_msw_cross.yml @@ -93,8 +93,6 @@ jobs: - name: Install prerequisites run: | - export DEBIAN_FRONTEND=noninteractive - packages="git make wine x11-xserver-utils xvfb" case "${HOST_TRIPLET}" in @@ -116,7 +114,7 @@ jobs: ;; esac - sudo apt-get -qq install $packages + sudo DEBIAN_FRONTEND=noninteractive apt-get -qq install $packages echo "wxTEST_RUNNER=${winerun}" >> $GITHUB_ENV From 144816105f7e790d61963d45a17f728b3b0c10ee Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Fri, 27 Aug 2021 23:29:41 +0200 Subject: [PATCH 3/3] Make apt even quieter Even "-qq" is insufficient to suppress the annoying, and useless for non-interactive use, "Reading database ... NN%" output, so add the option suppressing it to all apt commands. Also use "-y" as a single "-q" is not enough to suppress the prompts. --- .github/workflows/ci_msw_cross.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci_msw_cross.yml b/.github/workflows/ci_msw_cross.yml index a96459ba0b..c27e062363 100644 --- a/.github/workflows/ci_msw_cross.yml +++ b/.github/workflows/ci_msw_cross.yml @@ -83,7 +83,7 @@ jobs: shell: bash run: | apt-get -q -o=Dpkg::Use-Pty=0 update - apt-get -qq install sudo + apt-get -q -o=Dpkg::Use-Pty=0 -y install sudo # Create a user with the same UID/GID and name as the existing user # outside of the container and allow it using sudo without password. @@ -114,7 +114,7 @@ jobs: ;; esac - sudo DEBIAN_FRONTEND=noninteractive apt-get -qq install $packages + sudo DEBIAN_FRONTEND=noninteractive apt-get -q -o=Dpkg::Use-Pty=0 -y install $packages echo "wxTEST_RUNNER=${winerun}" >> $GITHUB_ENV