tests/docker: Use Fedora containers for MinGW cross-builds in the gitlab-CI
According to our support policy, we do not support Debian 9 in QEMU anymore, and we only support building the Windows binaries with a very recent version of the MinGW toolchain. So we should not test the MinGW cross-compilation with Debian 9 anymore, but switch to something newer like Fedora. To do this, we need a separate Fedora container for each build that provides the QEMU_CONFIGURE_OPTS environment variable. Unfortunately, the MinGW 64-bit compiler seems to be a little bit slow, so we also have to disable some features like "capstone" in the build here to make sure that the CI pipelines still finish within a reasonable amount of time. Signed-off-by: Thomas Huth <thuth@redhat.com> Signed-off-by: Alex Bennée <alex.bennee@linaro.org> Message-Id: <20200921174320.46062-2-thuth@redhat.com> Message-Id: <20200925154027.12672-10-alex.bennee@linaro.org>
This commit is contained in:
parent
f4d830c895
commit
93cc0506f6
@ -248,6 +248,16 @@ i386-fedora-cross-container:
|
|||||||
variables:
|
variables:
|
||||||
NAME: fedora-i386-cross
|
NAME: fedora-i386-cross
|
||||||
|
|
||||||
|
win32-fedora-cross-container:
|
||||||
|
<<: *container_job_definition
|
||||||
|
variables:
|
||||||
|
NAME: fedora-win32-cross
|
||||||
|
|
||||||
|
win64-fedora-cross-container:
|
||||||
|
<<: *container_job_definition
|
||||||
|
variables:
|
||||||
|
NAME: fedora-win64-cross
|
||||||
|
|
||||||
amd64-ubuntu1804-container:
|
amd64-ubuntu1804-container:
|
||||||
<<: *container_job_definition
|
<<: *container_job_definition
|
||||||
variables:
|
variables:
|
||||||
|
@ -105,9 +105,9 @@ cross-s390x-user:
|
|||||||
cross-win32-system:
|
cross-win32-system:
|
||||||
<<: *cross_system_build_job_definition
|
<<: *cross_system_build_job_definition
|
||||||
variables:
|
variables:
|
||||||
IMAGE: debian-win32-cross
|
IMAGE: fedora-win32-cross
|
||||||
|
|
||||||
cross-win64-system:
|
cross-win64-system:
|
||||||
<<: *cross_system_build_job_definition
|
<<: *cross_system_build_job_definition
|
||||||
variables:
|
variables:
|
||||||
IMAGE: debian-win64-cross
|
IMAGE: fedora-win64-cross
|
||||||
|
42
tests/docker/dockerfiles/fedora-win32-cross.docker
Normal file
42
tests/docker/dockerfiles/fedora-win32-cross.docker
Normal file
@ -0,0 +1,42 @@
|
|||||||
|
FROM fedora:32
|
||||||
|
|
||||||
|
# Please keep this list sorted alphabetically
|
||||||
|
ENV PACKAGES \
|
||||||
|
bc \
|
||||||
|
bzip2 \
|
||||||
|
diffutils \
|
||||||
|
findutils \
|
||||||
|
gcc \
|
||||||
|
gettext \
|
||||||
|
git \
|
||||||
|
hostname \
|
||||||
|
make \
|
||||||
|
meson \
|
||||||
|
mingw32-bzip2 \
|
||||||
|
mingw32-curl \
|
||||||
|
mingw32-glib2 \
|
||||||
|
mingw32-gmp \
|
||||||
|
mingw32-gnutls \
|
||||||
|
mingw32-gtk3 \
|
||||||
|
mingw32-libjpeg-turbo \
|
||||||
|
mingw32-libpng \
|
||||||
|
mingw32-libtasn1 \
|
||||||
|
mingw32-nettle \
|
||||||
|
mingw32-nsis \
|
||||||
|
mingw32-pixman \
|
||||||
|
mingw32-pkg-config \
|
||||||
|
mingw32-SDL2 \
|
||||||
|
perl \
|
||||||
|
perl-Test-Harness \
|
||||||
|
python3 \
|
||||||
|
python3-PyYAML \
|
||||||
|
python3-setuptools \
|
||||||
|
tar \
|
||||||
|
which
|
||||||
|
|
||||||
|
RUN dnf install -y $PACKAGES
|
||||||
|
RUN rpm -q $PACKAGES | sort > /packages.txt
|
||||||
|
ENV FEATURES mingw
|
||||||
|
|
||||||
|
# Specify the cross prefix for this image (see tests/docker/common.rc)
|
||||||
|
ENV QEMU_CONFIGURE_OPTS --cross-prefix=i686-w64-mingw32-
|
38
tests/docker/dockerfiles/fedora-win64-cross.docker
Normal file
38
tests/docker/dockerfiles/fedora-win64-cross.docker
Normal file
@ -0,0 +1,38 @@
|
|||||||
|
FROM fedora:32
|
||||||
|
|
||||||
|
# Please keep this list sorted alphabetically
|
||||||
|
ENV PACKAGES \
|
||||||
|
bc \
|
||||||
|
bzip2 \
|
||||||
|
diffutils \
|
||||||
|
findutils \
|
||||||
|
gcc \
|
||||||
|
gettext \
|
||||||
|
git \
|
||||||
|
hostname \
|
||||||
|
make \
|
||||||
|
meson \
|
||||||
|
mingw64-bzip2 \
|
||||||
|
mingw64-curl \
|
||||||
|
mingw64-glib2 \
|
||||||
|
mingw64-gmp \
|
||||||
|
mingw64-gtk3 \
|
||||||
|
mingw64-libjpeg-turbo \
|
||||||
|
mingw64-libpng \
|
||||||
|
mingw64-libtasn1 \
|
||||||
|
mingw64-pixman \
|
||||||
|
mingw64-pkg-config \
|
||||||
|
perl \
|
||||||
|
perl-Test-Harness \
|
||||||
|
python3 \
|
||||||
|
python3-PyYAML \
|
||||||
|
python3-setuptools \
|
||||||
|
tar \
|
||||||
|
which
|
||||||
|
|
||||||
|
RUN dnf install -y $PACKAGES
|
||||||
|
RUN rpm -q $PACKAGES | sort > /packages.txt
|
||||||
|
ENV FEATURES mingw
|
||||||
|
|
||||||
|
# Specify the cross prefix for this image (see tests/docker/common.rc)
|
||||||
|
ENV QEMU_CONFIGURE_OPTS --cross-prefix=x86_64-w64-mingw32- --disable-capstone
|
Loading…
Reference in New Issue
Block a user