StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

fix(CI): Update Wine from 5 to 7 in docker image to fix unit tests

Browse Source 
Root cause is unclear, but fixes failures in test_bsu and hangs in
test_smileypack.
This commit is contained in:
Anthony Bilinski 2022-02-15 04:44:16 -08:00
parent 88edc66f88
commit 79feb19d7d
No known key found for this signature in database
GPG Key ID: 2AA8E0DA1B31FB3C
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
buildscripts/docker/Dockerfile.windows_builder
View File

@ -41,15 +41,16 @@ RUN dpkg --add-architecture i386 && \
texinfo \ texinfo \
unzip \ unzip \
curl \ curl \
gnupg \
yasm \ yasm \
zip \ zip \
g++-mingw-w64-${ARCH//_/-} \ g++-mingw-w64-${ARCH//_/-} \
gcc-mingw-w64-${ARCH//_/-} \ gcc-mingw-w64-${ARCH//_/-} \
gdb-mingw-w64 \ gdb-mingw-w64
wine \ RUN curl -L --connect-timeout 10 https://dl.winehq.org/wine-builds/winehq.key | apt-key add -
wine32 \ RUN echo "deb https://dl.winehq.org/wine-builds/debian/ bullseye main" >> /etc/apt/sources.list.d/wine.list
wine64 && \ RUN apt-get update && apt-get install -y --no-install-recommends wine-stable
apt-get clean && \ RUN apt-get clean && \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
RUN update-alternatives --set ${ARCH}-w64-mingw32-gcc /usr/bin/${ARCH}-w64-mingw32-gcc-posix && \ RUN update-alternatives --set ${ARCH}-w64-mingw32-gcc /usr/bin/${ARCH}-w64-mingw32-gcc-posix && \
@ -233,4 +234,3 @@ RUN mkdir -p /src/gdb && \
RUN mkdir -p /qtox RUN mkdir -p /qtox
WORKDIR /qtox WORKDIR /qtox

1
windows/cross-compile/build.sh
View File

@ -115,6 +115,7 @@ if [[ $RUN_TESTS -ne 0 ]]
then then
export WINEPATH='/export;/windows/bin' export WINEPATH='/export;/windows/bin'
export CTEST_OUTPUT_ON_FAILURE=1 export CTEST_OUTPUT_ON_FAILURE=1
export PATH="$PATH:/opt/wine-stable/bin"
make test make test
fi fi
set -u set -u