[gimp/wip/Jehan/incremental-win-installer-improvements: 4/5] gitlab-ci: move the dependency moving step into the build stage.

[Jehan <jehanp src gnome org>]

commit 681d52cacf7a9e1161eba2a351d5ec30a60a91e5
Author: Jehan <jehan girinstud io>
Date:   Fri May 21 10:36:46 2021 +0200

    gitlab-ci: move the dependency moving step into the build stage.
    
    The last stage (installer creation) takes just too much time, and it
    exceeded the max execution time (80 min) in my last test build. Instead
    of increasing this max execution time, let's move the run of
    package-gimp-msys2.sh script in the same step as the build one. Maybe
    adding an intermediate stage would have been better conceptually, but
    every stage also takes some preparation and finalization time (setting
    up the runner, loading, cleaning the uploading the cache, etc.) and our
    installer pipeline is already long enough.
    So let's just go like this for now.
    
    As a side effect, the last job's log limit was exceeded too since I
    added the Python option, which should hopefully also be fixed by moving
    steps out of the installer job.

 .gitlab-ci.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0d9e5aaaba..23cef9de98 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -279,6 +279,7 @@ gimp-win64-native:
   script:
     - C:\msys64\usr\bin\pacman --noconfirm -Syyuu
     - C:\msys64\usr\bin\bash -lc "bash -x ./build/windows/gitlab-ci/build-gimp-msys2.sh"
+    - C:\msys64\usr\bin\bash -lc "bash -x ./build/windows/gitlab-ci/package-gimp-msys2.sh"
     - cd _install-w64
     - C:\msys64\usr\bin\bash -lc "bash -x ../build/windows/gitlab-ci/split-debug-msys2.sh"
   artifacts:
@@ -286,7 +287,7 @@ gimp-win64-native:
     when: always
     expire_in: 1 day
     paths:
-    - _install-w64
+    - gimp-w64
     - build/windows/installer/lang/
   cache:
     paths:
@@ -335,6 +336,7 @@ gimp-win32-native:
   script:
     - C:\msys64\usr\bin\pacman --noconfirm -Syyuu
     - C:\msys64\usr\bin\bash -lc "bash -x ./build/windows/gitlab-ci/build-gimp-msys2.sh"
+    - C:\msys64\usr\bin\bash -lc "bash -x ./build/windows/gitlab-ci/package-gimp-msys2.sh"
     - cd _install-w32
     - C:\msys64\usr\bin\bash -lc "bash -x ../build/windows/gitlab-ci/split-debug-msys2.sh"
   artifacts:
@@ -342,7 +344,7 @@ gimp-win32-native:
     when: always
     expire_in: 1 day
     paths:
-    - _install-w32
+    - gimp-w32
   cache:
     paths:
     - _ccache/
@@ -536,8 +538,6 @@ win-installer-nightly:
     - build/windows/installer/_Output
   script:
     - C:\msys64\usr\bin\pacman --noconfirm -Syyuu
-    - C:\msys64\usr\bin\bash -lc "MSYSTEM=MINGW64 bash -x ./build/windows/gitlab-ci/package-gimp-msys2.sh"
-    - C:\msys64\usr\bin\bash -lc "MSYSTEM=MINGW32 bash -x ./build/windows/gitlab-ci/package-gimp-msys2.sh"
     - C:\msys64\usr\bin\bash -lc "bash -x ./build/windows/gitlab-ci/installer-gimp-msys2.sh"
   needs: ["gimp-win32-native", "gimp-win64-native"]