From fd5fd056224de31c2dc7333f3546a69b1211d7c9 Mon Sep 17 00:00:00 2001
From: TomTheFurry <tomlee92502@yahoo.com>
Date: Thu, 23 Jun 2022 22:56:26 +0800
Subject: [PATCH] Front-port the ci fixes by magneticflux for now

---
 .gitlab-ci.yml | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 756d36c25..e01bc15c6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -28,8 +28,9 @@ build_16_5:
     # make sure any previously merged jars are removed before running this job.
     # note: if the merged folder doesn't exist "rm -R Merged" will throw an error, which can be ignored
     #       the "|| true" makes that step always succeed.
-    - rm -R Merged || true; 
-    - ./gradlew build -PmcVer=1.16.5 --gradle-user-home cache/;
+    - rm -R Merged || true;
+    - ./gradlew deleteMerged --gradle-user-home cache/;
+    - ./gradlew build -PmcVer="1.16.5" --gradle-user-home cache/;
     - ./gradlew merge --gradle-user-home cache/;
     - ./gradlew test --gradle-user-home cache/;
   # build using Java 16
@@ -55,7 +56,8 @@ build_17_1:
   stage: build_17_1
   script:
     - rm -R Merged || true;
-    - ./gradlew build -PmcVer=1.17.1 --gradle-user-home cache/;
+    - ./gradlew deleteMerged --gradle-user-home cache/;
+    - ./gradlew build -PmcVer="1.17.1" --gradle-user-home cache/;
     - ./gradlew merge --gradle-user-home cache/;
     - ./gradlew test --gradle-user-home cache/;
   image: eclipse-temurin:16
@@ -78,7 +80,8 @@ build_18_1:
   stage: build_18_1
   script: 
     - rm -R Merged || true;
-    - ./gradlew build -PmcVer=1.18.1 --gradle-user-home cache/; 
+    - ./gradlew deleteMerged --gradle-user-home cache/;
+    - ./gradlew build -PmcVer="1.18.1" --gradle-user-home cache/;
     - ./gradlew merge --gradle-user-home cache/;
     - ./gradlew test --gradle-user-home cache/;
   # build using Java 17
@@ -102,7 +105,8 @@ build_18_2:
   stage: build_18_2
   script:
     - rm -R Merged || true;
-    - ./gradlew build -PmcVer=1.18.2 --gradle-user-home cache/;
+    - ./gradlew deleteMerged --gradle-user-home cache/;
+    - ./gradlew build -PmcVer="1.18.2" --gradle-user-home cache/;
     - ./gradlew merge --gradle-user-home cache/;
     - ./gradlew test --gradle-user-home cache/;
   image: eclipse-temurin:17
@@ -125,8 +129,9 @@ build_19:
   stage: build_19
   script:
     - ./gradlew deleteMerged --gradle-user-home cache/;
-    - ./gradlew build -PmcVer=1.19 --gradle-user-home cache/;
+    - ./gradlew build -PmcVer="1.19" --gradle-user-home cache/;
     - ./gradlew merge --gradle-user-home cache/;
+    - ./gradlew test --gradle-user-home cache/;
   image: eclipse-temurin:17
   artifacts:
     name: "Merged_NightlyBuild_1_19-${CI_COMMIT_SHORT_SHA}-${CI_COMMIT_TIMESTAMP}"