From 6500c889d91eec6f71cc9ec7edde82d5609f07bb Mon Sep 17 00:00:00 2001
From: Pierre-Antoine Rouby <pierre-antoine.rouby@inrae.fr>
Date: Wed, 2 Aug 2023 09:56:01 +0200
Subject: [PATCH] ci: Downloads mage from release Test5 and add mage to windows
 versions.

---
 .gitlab-ci.yml       | 60 ++++++++++++++++++++++++++++++++++----------
 packages/linux.sh    |  6 ++---
 packages/windows.bat |  8 +++---
 3 files changed, 54 insertions(+), 20 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8fc82ee9..19d0962c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -30,20 +30,54 @@ build-mage-linux:
     - linux
   rules:
     - if: $CI_COMMIT_BRANCH == 'master' || $CI_COMMIT_TAG
-  variables:
-    GIT_SUBMODULE_STRATEGY: recursive
-    GIT_SUBMODULE_DEPTH: 20
   script:
-    - cd mage/src/
-    - mkdir -p build
-    - cd build
-    - cmake ..
-    - make
+    - curl -L -o mage.tgz https://gitlab.irstea.fr/jean-baptiste.faure/mage/-/releases/Test5/downloads/packages/mage_linux.tgz
+    - mkdir -p mage
+    - cd mage
+    - tar xvf ../mage.tgz
   artifacts:
     paths:
-      - mage/src/build/mage
-      - mage/src/build/mage_extraire
-      - mage/src/build/mailleurPF
+      - mage/mage
+      - mage/mage_extraire
+      - mage/mailleurPF
+
+# build-mage-linux:
+#   stage: build
+#   tags:
+#     - linux
+#   rules:
+#     - if: $CI_COMMIT_BRANCH == 'master' || $CI_COMMIT_TAG
+#   variables:
+#     GIT_SUBMODULE_STRATEGY: recursive
+#     GIT_SUBMODULE_DEPTH: 20
+#   script:
+#     - cd mage/src/
+#     - mkdir -p build
+#     - cd build
+#     - cmake ..
+#     - make
+#   artifacts:
+#     paths:
+#       - mage/src/build/mage
+#       - mage/src/build/mage_extraire
+#       - mage/src/build/mailleurPF
+
+build-mage-windows:
+  stage: build
+  tags:
+    - linux
+  rules:
+    - if: $CI_COMMIT_BRANCH == 'master' || $CI_COMMIT_TAG
+  script:
+    - curl -L -o mage.tgz https://gitlab.irstea.fr/jean-baptiste.faure/mage/-/releases/Test5/downloads/packages/mage_windows.tgz
+    - mkdir -p mage
+    - cd mage
+    - tar xvf ../mage.tgz
+  artifacts:
+    paths:
+      - mage/mage.exe
+      - mage/mage_extraire.exe
+      - mage/mailleurPF.exe
 
 # build-mage-windows:
 #   stage: build
@@ -136,8 +170,8 @@ windows-package:
       artifacts: true
     - job: build
       artifacts: true
-    # - job: build-mage-windows
-    #   artifacts: true
+    - job: build-mage-windows
+      artifacts: true
   rules:
     - if: $CI_COMMIT_BRANCH == 'master' || $CI_COMMIT_TAG
   artifacts:
diff --git a/packages/linux.sh b/packages/linux.sh
index 9bfddf54..023fa079 100755
--- a/packages/linux.sh
+++ b/packages/linux.sh
@@ -56,9 +56,9 @@ cp ../AUTHORS dist/pamhyr/
 cp ../LICENSE dist/pamhyr/
 
 mkdir -p dist/pamhyr/MAGE/
-cp ../mage/src/build/mage dist/pamhyr/MAGE/
-cp ../mage/src/build/mage_extraire dist/pamhyr/MAGE/
-cp ../mage/src/build/mailleurPF dist/pamhyr/MAGE/
+cp ../mage/mage dist/pamhyr/MAGE/
+cp ../mage/mage_extraire dist/pamhyr/MAGE/
+cp ../mage/mailleurPF dist/pamhyr/MAGE/
 
 echo " *** MAKE SRC PACKAGE"
 
diff --git a/packages/windows.bat b/packages/windows.bat
index 451dc195..65ac8f61 100644
--- a/packages/windows.bat
+++ b/packages/windows.bat
@@ -40,10 +40,10 @@ copy /y ..\AUTHORS dist\pamhyr\
 copy /y ..\LICENSE dist\pamhyr\
 
 rem MAGE
-rem mkdir dist\pamhyr\MAGE
-rem copy /y ..\mage\src\build\mage.exe dist\pamhyr\MAGE\
-rem copy /y ..\mage\src\build\mage_extraire.exe dist\pamhyr\MAGE\
-rem copy /y ..\mage\src\build\mailleurPF.exe dist\pamhyr\MAGE\
+mkdir dist\pamhyr\MAGE
+copy /y ..\mage\mage.exe dist\pamhyr\MAGE\
+copy /y ..\mage\mage_extraire.exe dist\pamhyr\MAGE\
+copy /y ..\mage\mailleurPF.exe dist\pamhyr\MAGE\
 
 rem Make installer
 "C:\Program Files (x86)\NSIS\makensis.exe" pamhyr.nsi
-- 
GitLab