[gimp/wip/Jehan/gitlab-ci-win-32-bit: 21/23] Damn.

[Jehan <jehanp src gnome org>]

commit bedc096b4528824c4cd3415b1b08bf11d2bfe2cb
Author: Jehan <jehan girinstud io>
Date:   Wed May 12 16:52:11 2021 +0200

    Damn.

 .gitlab-ci.yml                              | 4 ++++
 build/windows/gitlab-ci/build-gimp-msys2.sh | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ef502ae209..1940dbbe41 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -243,9 +243,11 @@ gimp-win64-native:
   tags:
     - win32-ps
   script:
+    - mv _install-w64 ~
     - git clean -dfx
     - C:\msys64\usr\bin\pacman --noconfirm -Syyuu
     - C:\msys64\usr\bin\bash -lc "bash -x ./build/windows/gitlab-ci/build-gimp-msys2.sh"
+    - mv ~/_install-w64 .
   artifacts:
     name: "${CI_JOB_NAME}-${CI_COMMIT_REF_SLUG}"
     when: always
@@ -290,9 +292,11 @@ gimp-win32-native:
   tags:
     - win32-ps
   script:
+    - mv _install-w32 ~
     - git clean -dfx
     - C:\msys64\usr\bin\pacman --noconfirm -Syyuu
     - C:\msys64\usr\bin\bash -lc "bash -x ./build/windows/gitlab-ci/build-gimp-msys2.sh"
+    - mv ~/_install-w32 .
   artifacts:
     name: "${CI_JOB_NAME}-${CI_COMMIT_REF_SLUG}"
     when: always
diff --git a/build/windows/gitlab-ci/build-gimp-msys2.sh b/build/windows/gitlab-ci/build-gimp-msys2.sh
index 42ae685b08..bce6388511 100644
--- a/build/windows/gitlab-ci/build-gimp-msys2.sh
+++ b/build/windows/gitlab-ci/build-gimp-msys2.sh
@@ -80,7 +80,7 @@ pacman --noconfirm -S --needed \
 # XXX We've got a weird error when the prefix is in the current dir.
 # Until we figure it out, this trick seems to work, even though it's
 # completely ridiculous.
-mv "_install${ARTIFACTS_SUFFIX}" ~
+#mv "_install${ARTIFACTS_SUFFIX}" ~
 
 export GIMP_PREFIX="`realpath ~/_install`${ARTIFACTS_SUFFIX}"
 export PATH="$GIMP_PREFIX/bin:$PATH"
@@ -108,4 +108,4 @@ cd ..
 ccache --show-stats
 
 # XXX Moving back the prefix to be used as artifacts.
-mv "${GIMP_PREFIX}" .
+#mv "${GIMP_PREFIX}" .