From d5bbeceeb2a4115d98ff151b34020a1e58d6f86b Mon Sep 17 00:00:00 2001
From: Alexandre Duret-Lutz <adl@lrde.epita.fr>
Date: Wed, 1 Sep 2021 17:57:25 +0200
Subject: [PATCH] * .gitlab-ci.yml (mingw-shared, mingw-static): Build from a
 tarball.

---
 .gitlab-ci.yml | 36 +++++++++++++++++++++++++-----------
 1 file changed, 25 insertions(+), 11 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 15e9f4b50..0abb1c6cb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -155,47 +155,61 @@ arch-gcc-glibcxxdebug:
       - ./*.log
 
 mingw-shared:
-  stage: build
+  stage: build2
+  needs:
+    # We start from the tarball generated from a non-cross-compiling
+    # job, so that all generated files are included, especially those
+    # built from the executables.
+    - job: debian-stable-gcc
+      artifacts: true
   only:
     - branches
   except:
     - /wip/
   image: gitlab-registry.lrde.epita.fr/spot/buildenv/debian
   script:
-    - autoreconf -vfi
+    - VERSION=`autoconf --trace='AC_INIT:$2'`
+    - tar xvf spot-$VERSION.tar.gz
+    - cd spot-$VERSION
     - ./configure CC=i686-w64-mingw32-gcc CXX=i686-w64-mingw32-g++-posix --host i686-w64-mingw32 --disable-python
-    - touch doc/org-stamp
     - make
   artifacts:
     when: on_failure
     paths:
-      - tests/*/*.log
-      - ./*.log
+      - spot-*/tests/*/*.log
+      - spot-*/*.log
 
 mingw-static:
-  stage: build
+  stage: build2
+  needs:
+    # We start from the tarball generated from a non-cross-compiling
+    # job, so that all generated files are included, especially those
+    # built from the executables.
+    - job: debian-stable-gcc
+      artifacts: true
   only:
     - branches
   except:
     - /wip/
   image: gitlab-registry.lrde.epita.fr/spot/buildenv/debian
   script:
+    - VERSION=`autoconf --trace='AC_INIT:$2'`
+    - tar xvf spot-$VERSION.tar.gz
+    - cd spot-$VERSION
     - mkdir install_dir
-    - autoreconf -vfi
     - ./configure CC=i686-w64-mingw32-gcc CXX=i686-w64-mingw32-g++-posix --host i686-w64-mingw32 --disable-python --disable-shared --enable-optimizations --disable-devel LDFLAGS='-static-libgcc -static-libstdc++ -Wl,-Bstatic,--whole-archive -Wl,-lwinpthread -Wl,--no-whole-archive' --prefix=/usr
     - touch doc/org-stamp
     - make
     - make install-exec DESTDIR=$PWD/install_dir
-    - VERSION=`autoconf --trace='AC_INIT:$2'`
     - cd install_dir
     - i686-w64-mingw32-strip usr/bin/*
     - tar cfvz ../spot-${VERSION}-${CI_COMMIT_REF_SLUG}-bin.tar.gz *
   artifacts:
     when: always
     paths:
-      - tests/*/*.log
-      - ./*.log
-      - ./*.tar.gz
+      - spot-*/tests/*/*.log
+      - spot-*/*.log
+      - spot-*/*.tar.gz
 
 debpkg-stable:
   stage: build