From 9f4afb76d847a469cc4384746ef08bd601500f03 Mon Sep 17 00:00:00 2001 From: David Woodhouse Date: Sat, 29 May 2021 11:03:55 +0100 Subject: [PATCH] Fix MinGW CI build to use their own docker images, now we have them. Signed-off-by: David Woodhouse --- .gitlab-ci.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 90909755..9b73ad0f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,6 +4,8 @@ variables: CENTOS7_BUILD: openconnect-cli-centos7 CENTOS8_BUILD: openconnect-cli-centos8 FEDORA_BUILD: openconnect-cli-fedora + MINGW32_BUILD: openconnect-cli-mingw32 + MINGW64_BUILD: openconnect-cli-mingw64 UBUNTU_BUILD: openconnect-cli-ubuntu image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$FEDORA_BUILD @@ -429,6 +431,7 @@ Ubuntu18.04/OpenSSL: - tests/*.log MinGW32/GnuTLS: + image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$MINGW32_BUILD script: - mount -t binfmt_misc binfmt_misc /proc/sys/fs/binfmt_misc - echo ':DOSWin:M::MZ::/usr/bin/wine:' > /proc/sys/fs/binfmt_misc/register @@ -451,6 +454,7 @@ MinGW32/GnuTLS: - openconnect-installer.exe MinGW32/OpenSSL: + image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$MINGW32_BUILD script: - mount -t binfmt_misc binfmt_misc /proc/sys/fs/binfmt_misc - echo ':DOSWin:M::MZ::/usr/bin/wine:' > /proc/sys/fs/binfmt_misc/register @@ -473,6 +477,7 @@ MinGW32/OpenSSL: - openconnect-installer.exe MinGW64/GnuTLS: + image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$MINGW64_BUILD script: - dnf remove -y wine.i686 - mount -t binfmt_misc binfmt_misc /proc/sys/fs/binfmt_misc @@ -496,6 +501,7 @@ MinGW64/GnuTLS: - openconnect-installer.exe MinGW64/OpenSSL: + image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$MINGW64_BUILD script: - dnf remove -y wine.i686 - mount -t binfmt_misc binfmt_misc /proc/sys/fs/binfmt_misc -- 2.49.0