Skip to content

Commit c7592bc

Browse files
committed
ci: Remove Windows tasks from Cirrus CI
1 parent fe24738 commit c7592bc

File tree

2 files changed

+1
-82
lines changed

2 files changed

+1
-82
lines changed

.cirrus.yml

-62
Original file line numberDiff line numberDiff line change
@@ -216,68 +216,6 @@ task:
216216
- ./ci/cirrus.sh
217217
<< : *CAT_LOGS
218218

219-
task:
220-
<< : *LINUX_CONTAINER
221-
env:
222-
WRAPPER_CMD: wine
223-
WITH_VALGRIND: no
224-
ECDH: yes
225-
RECOVERY: yes
226-
SCHNORRSIG: yes
227-
CTIMETESTS: no
228-
matrix:
229-
- name: "x86_64 (mingw32-w64): Windows (Debian stable, Wine)"
230-
env:
231-
HOST: x86_64-w64-mingw32
232-
- name: "i686 (mingw32-w64): Windows (Debian stable, Wine)"
233-
env:
234-
HOST: i686-w64-mingw32
235-
test_script:
236-
- ./ci/cirrus.sh
237-
<< : *CAT_LOGS
238-
239-
task:
240-
<< : *LINUX_CONTAINER
241-
env:
242-
WRAPPER_CMD: wine
243-
WERROR_CFLAGS: -WX
244-
WITH_VALGRIND: no
245-
ECDH: yes
246-
RECOVERY: yes
247-
EXPERIMENTAL: yes
248-
SCHNORRSIG: yes
249-
ELLSWIFT: yes
250-
CTIMETESTS: no
251-
# Use a MinGW-w64 host to tell ./configure we're building for Windows.
252-
# This will detect some MinGW-w64 tools but then make will need only
253-
# the MSVC tools CC, AR and NM as specified below.
254-
HOST: x86_64-w64-mingw32
255-
CC: /opt/msvc/bin/x64/cl
256-
AR: /opt/msvc/bin/x64/lib
257-
NM: /opt/msvc/bin/x64/dumpbin -symbols -headers
258-
# Set non-essential options that affect the CLI messages here.
259-
# (They depend on the user's taste, so we don't want to set them automatically in configure.ac.)
260-
CFLAGS: -nologo -diagnostics:caret
261-
LDFLAGS: -Xlinker -Xlinker -Xlinker -nologo
262-
matrix:
263-
- name: "x86_64 (MSVC): Windows (Debian stable, Wine)"
264-
- name: "x86_64 (MSVC): Windows (Debian stable, Wine, int128_struct)"
265-
env:
266-
WIDEMUL: int128_struct
267-
- name: "x86_64 (MSVC): Windows (Debian stable, Wine, int128_struct with __(u)mulh)"
268-
env:
269-
WIDEMUL: int128_struct
270-
CPPFLAGS: -DSECP256K1_MSVC_MULH_TEST_OVERRIDE
271-
- name: "i686 (MSVC): Windows (Debian stable, Wine)"
272-
env:
273-
HOST: i686-w64-mingw32
274-
CC: /opt/msvc/bin/x86/cl
275-
AR: /opt/msvc/bin/x86/lib
276-
NM: /opt/msvc/bin/x86/dumpbin -symbols -headers
277-
test_script:
278-
- ./ci/cirrus.sh
279-
<< : *CAT_LOGS
280-
281219
# Sanitizers
282220
task:
283221
<< : *LINUX_CONTAINER

ci/linux-debian.Dockerfile

+1-20
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM debian:stable
1+
FROM debian:stable-slim
22

33
SHELL ["/bin/bash", "-c"]
44

@@ -20,8 +20,6 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
2020
gcc-arm-linux-gnueabihf libc6-dev-armhf-cross libc6-dbg:armhf \
2121
gcc-aarch64-linux-gnu libc6-dev-arm64-cross libc6-dbg:arm64 \
2222
gcc-powerpc64le-linux-gnu libc6-dev-ppc64el-cross libc6-dbg:ppc64el \
23-
gcc-mingw-w64-x86-64-win32 wine64 wine \
24-
gcc-mingw-w64-i686-win32 wine32 \
2523
sagemath
2624

2725
WORKDIR /root
@@ -56,20 +54,3 @@ RUN wget -qO- https://apt.llvm.org/llvm-snapshot.gpg.key | tee /etc/apt/trusted.
5654
# Create symlinks for them
5755
ln -s $(ls /usr/bin/clang-?? | sort | tail -1) /usr/bin/clang-snapshot && \
5856
ln -s $(ls /usr/bin/clang-?? | sort | head -1) /usr/bin/clang
59-
60-
# The "wine" package provides a convenience wrapper that we need
61-
RUN apt-get update && apt-get install --no-install-recommends -y \
62-
git ca-certificates wine64 wine python3-simplejson python3-six msitools winbind procps && \
63-
# Workaround for `wine` package failure to employ the Debian alternatives system properly.
64-
ln -s /usr/lib/wine/wine64 /usr/bin/wine64 && \
65-
# Set of tools for using MSVC on Linux.
66-
git clone https://github.com/mstorsjo/msvc-wine && \
67-
mkdir /opt/msvc && \
68-
python3 msvc-wine/vsdownload.py --accept-license --dest /opt/msvc Microsoft.VisualStudio.Workload.VCTools && \
69-
# Since commit 2146cbfaf037e21de56c7157ec40bb6372860f51, the
70-
# msvc-wine effectively initializes the wine prefix when running
71-
# the install.sh script.
72-
msvc-wine/install.sh /opt/msvc && \
73-
# Wait until the wineserver process has exited before closing the session,
74-
# to avoid corrupting the wine prefix.
75-
while (ps -A | grep wineserver) > /dev/null; do sleep 1; done

0 commit comments

Comments
 (0)