[meld/windows-font-fixes] CI: Fix artifact naming; duplicate some possible msys hacks

[Kai Willadsen <kaiw src gnome org>]

commit 92ede33309766210a621a492f1e879059ebc09ed
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Sat May 23 08:06:53 2020 +1000

    CI: Fix artifact naming; duplicate some possible msys hacks

 .gitlab-ci.yml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 27df5724..faa69234 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -48,7 +48,7 @@ pytest:
   tags: # select gitlab runners with specific tag (unrelated to git repo tags)
     - 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:
@@ -72,11 +72,13 @@ pytest:
 mingw64-dist:
   extends: .mingw-common
   variables:
-    MSYS2_ARCH: x86_64
-    MSYSTEM: MINGW64
+    MSYS2_ARCH: "x86_64"
+    MSYSTEM: "MINGW64"
+    CHERE_INVOKING: "yes"
 
 mingw32-dist:
   extends: .mingw-common
   variables:
-    MSYS2_ARCH: i686
+    MSYS2_ARCH: "i686"
     MSYSTEM: "MINGW32"
+    CHERE_INVOKING: "yes"