[meld/windows-ci-fix-3-20: 1/2] CI: Sync up Windows build with the newer CI build from master

[Kai Willadsen <kaiw src gnome org>]

commit 84ed53ae4718ebbaa39fb45a8c273b6ff8928d78
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Sat Feb 13 14:28:06 2021 +1000

    CI: Sync up Windows build with the newer CI build from master
    
    Ideally we wouldn't be doing this in a stable branch, but the job
    workers that we were using for Windows CI builds previously no longer
    exist.

 .gitlab-ci.yml | 30 ++++++++++++++++++++----------
 1 file changed, 20 insertions(+), 10 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 65bc52be..0b83a114 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -33,17 +33,25 @@ linux-build:
     - python3 setup.py build
   <<: *linux-common
 
-.mingw-common: &mingw-common
+.mingw-common:
   stage: build
   tags: # select gitlab runners with specific tag (unrelated to git repo tags)
-    - win32
+    - win32-ps
   artifacts:
-    name: "%CI_JOB_STAGE%-%CI_COMMIT_REF_NAME%"
+    name: "${env:CI_JOB_STAGE}-${env:CI_COMMIT_REF_NAME}"
     paths:
       - dist/
   before_script:
-    - path C:\msys64\%MSYSTEM%\bin;C:\msys64\usr\bin;%PATH%
-    - pacman --noconfirm -S --refresh --sysupgrade --needed mingw-w64-%MSYS2_ARCH%-python3-cx_Freeze 
mingw-w64-%MSYS2_ARCH%-python3-gobject mingw-w64-%MSYS2_ARCH%-python3-pytest 
mingw-w64-%MSYS2_ARCH%-gtksourceview3 mingw-w64-%MSYS2_ARCH%-gsettings-desktop-schemas glib2-devel intltool
+    - $env:Path = "C:\msys64\${env:MSYSTEM}\bin;C:\msys64\usr\bin;${env:PATH}"
+    - >
+      C:\msys64\usr\bin\pacman --noconfirm -S --refresh --sysupgrade --needed
+      mingw-w64-${env:MSYS2_ARCH}-python3-cx_Freeze
+      mingw-w64-${env:MSYS2_ARCH}-python3-gobject
+      mingw-w64-${env:MSYS2_ARCH}-python3-pytest
+      mingw-w64-${env:MSYS2_ARCH}-gtksourceview3
+      mingw-w64-${env:MSYS2_ARCH}-gsettings-desktop-schemas
+      glib2-devel
+      intltool
   script:
     - glib-compile-schemas data
     - python3 setup_win32.py bdist_dumb --bdist-dir build\bdist.mingw\msi --keep-temp bdist_msi --keep-temp
@@ -52,13 +60,15 @@ linux-build:
   allow_failure: true
 
 mingw64-dist:
+  extends: .mingw-common
   variables:
-    MSYS2_ARCH: x86_64
-    MSYSTEM: MINGW64
-  <<: *mingw-common
+    MSYS2_ARCH: "x86_64"
+    MSYSTEM: "MINGW64"
+    CHERE_INVOKING: "yes"
 
 mingw32-dist:
+  extends: .mingw-common
   variables:
-    MSYS2_ARCH: i686
+    MSYS2_ARCH: "i686"
     MSYSTEM: "MINGW32"
-  <<: *mingw-common
+    CHERE_INVOKING: "yes"