.gitlab-ci.yml: use separate 32 and 64 mingw images

Signed-off-by: Alexander Sosedkin <asosedkin@redhat.com>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 52d3459619c7042ef8df90c4afda23ba1381e1c2..e3d7fb421294c05f75160e14529114fdaff6bcdb 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,7 +17,8 @@ variables:
   FEDORA_DOC_BUILD: buildenv-doc-fedora42
   FEDORA_CROSS_BUILD: buildenv-cross-fedora42
   FEDORA_I686_BUILD: buildenv-i686-fedora42
-  MINGW_BUILD: buildenv-mingw-fedora43
+  MINGW32_BUILD: buildenv-mingw32-fedora43
+  MINGW64_BUILD: buildenv-mingw64-fedora43
   ALPINE_BASE_BUILD: buildenv-alpine-base
   COMPILER: gcc
   CPPCHECK_OPTIONS: "--enable=warning --enable=performance --enable=portability --std=c99 --suppressions-list=devel/cppcheck.suppressions --template='{id}:{file}:{line},{severity},{message}'"
@@ -110,7 +111,6 @@ default:
   image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$DEBIAN_BUILD
 
 .mingw:
-  image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$MINGW_BUILD
   variables:
     # COMPILER: "${arch_name}-w64-mingw32-gcc"
     # CFLAGS: "-fstack-protector"
@@ -127,6 +127,7 @@ default:
   allow_failure: true
 
 .mingw32:
+  image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$MINGW32_BUILD
   extends:
     - .mingw
   variables:
@@ -134,6 +135,7 @@ default:
     arch_name: i686
 
 .mingw64:
+  image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$MINGW64_BUILD
   extends:
     - .mingw
   variables:
@@ -738,7 +740,6 @@ debian/test:
   extends:
     - .build
   script:
-    - "wineserver -k || true"
     - mount -t binfmt_misc binfmt_misc /proc/sys/fs/binfmt_misc
     - "[ -e /proc/sys/fs/binfmt_misc/DOSWin ] || echo ':DOSWin:M::MZ::/usr/bin/wine:' > /proc/sys/fs/binfmt_misc/register"
     - mingw${arch_bits}-configure --disable-gcc-warnings --host=${arch_name}-w64-mingw32 --target=${arch_name}-w64-mingw32 --cache-file $CCACHE_FILE --disable-nls --with-included-unistring --disable-non-suiteb-curves --disable-full-test-suite --disable-doc --with-pkcs12-iter-count=10000
@@ -749,7 +750,6 @@ debian/test:
   extends:
     - .test
   script:
-    - "wineserver -k || true"
     - mount -t binfmt_misc binfmt_misc /proc/sys/fs/binfmt_misc
     - "[ -e /proc/sys/fs/binfmt_misc/DOSWin ] || echo ':DOSWin:M::MZ::/usr/bin/wine:' > /proc/sys/fs/binfmt_misc/register"
     - mingw${arch_bits}-make -j$CHECKJOBS -C tests check
@@ -789,10 +789,16 @@ debian/test:
     paths:
       - win${arch_bits}-build/
 
-mingw/bootstrap:
+mingw32/bootstrap:
   extends:
     - .bootstrap
-    - .mingw
+    - .mingw32
+  when: manual
+
+mingw64/bootstrap:
+  extends:
+    - .bootstrap
+    - .mingw64
   when: manual
 
 mingw64/build:
@@ -800,7 +806,7 @@ mingw64/build:
     - .mingw/build
     - .mingw64
   needs:
-    - mingw/bootstrap
+    - mingw64/bootstrap
 
 mingw64/test:
   extends:
@@ -828,7 +834,7 @@ mingw32/build:
     - .mingw/build
     - .mingw32
   needs:
-    - mingw/bootstrap
+    - mingw32/bootstrap
 
 mingw32/test:
   extends: