From 5cc31efa12c761246a6100ea272cedeb7d2c35fa Mon Sep 17 00:00:00 2001
From: James Seibel <jeseibel@gondtc.com>
Date: Tue, 15 Mar 2022 02:16:04 +0000
Subject: [PATCH] Attempt to add 1.18.1 and 1.18.2 auto building

---
 .gitlab-ci.yml | 83 ++++++++++++++++++--------------------------------
 1 file changed, 29 insertions(+), 54 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6f2dfb293..24ad33801 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,8 +4,8 @@ image: gradle:eclipse-temurin
 # all stages need to be defined here
 stages:
   - gradleSetup
-  - build
-  - merge
+  - build_18-1
+  - build_18-2
 
 variables:
     # Disable the Gradle daemon for Continuous Integration servers as correctness
@@ -25,7 +25,6 @@ before_script:
 
 
 
-# first stage
 # This prevents us from re-downloading Gradle every stage
 gradleSetup:
     stage: gradleSetup
@@ -42,71 +41,47 @@ gradleSetup:
 
 
 
-# second stage
-build:
-    stage: build
-    script: ./gradlew build --gradle-user-home cache/
+# 1.18.1 build
+build_18-1:
+    stage: build_18-1
+    script: ./gradlew build -PmcVer=1.18.1 --gradle-user-home cache/; ./gradlew merge --gradle-user-home cache/
     # build using Java 17
     image: eclipse-temurin:17
     cache:
-        key: "$CI_COMMIT_REF_NAME"
+        key: "$CI_COMMIT_REF_NAME_18-1"
         policy: pull-push
         paths:
-            - .architectury-transformer
-            - .gradle
-            - build
-            - common/.gradle
-            - common/build
-            - core/.gradle
-            - core/build
-            - fabric/.gradle
-            - fabric/src/generated
-            - forge/.gradle
-            - forge/src/generated
-            - build
             - .gradle
             - cache/
     artifacts:
-        name: "NightlyBuild-$CI_COMMIT_SHORT_SHA}-${CI_COMMIT_TIMESTAMP}"  
-        paths:
-            # relative to the root directory
-            - fabric/build/libs
-            - forge/build/libs
-        exclude:
-            - fabric/build/libs/*-dev.jar
-            - fabric/build/libs/*-dev-shadow.jar
-            - fabric/build/libs/*-sources-dev.jar
-            - fabric/build/libs/*-sources.jar
-            - forge/build/libs/*-dev.jar
-            - forge/build/libs/*-dev-shadow.jar
-            - forge/build/libs/*-sources-dev.jar
-            - forge/build/libs/*-sources.jar
-        reports:
-            # To ensure we've access to these files in the next stage
-            dotenv: generate_jars.env
-        expire_in: 1 day
-
-# third stage
-merge:
-    stage: merge
-    script: ./gradlew merge --gradle-user-home cache/ 
-    # build using Java 17
-    image: eclipse-temurin:17
-    cache:
-        key: "$CI_COMMIT_REF_NAME"
-        policy: pull-push
-        paths:
-            - build
-            - .gradle
-            - cache/
-    artifacts:
-        name: "Merged_NightlyBuild-${CI_COMMIT_SHORT_SHA}-${CI_COMMIT_TIMESTAMP}"  
+        name: "Merged_NightlyBuild-${CI_COMMIT_SHORT_SHA}-${CI_COMMIT_TIMESTAMP}_18-1"  
         paths:
             # relative to the root directory
             - Merged
         expire_in: 1 day
 
 
+# 1.18.2 build
+build_18-2:
+    stage: build_18-2
+    script: ./gradlew build -PmcVer=1.18.2 --gradle-user-home cache/; ./gradlew merge --gradle-user-home cache/
+    # build using Java 17
+    image: eclipse-temurin:17
+    cache:
+        key: "$CI_COMMIT_REF_NAME_18-2"
+        policy: pull-push
+        paths:
+            - .gradle
+            - cache/
+    artifacts:
+        name: "Merged_NightlyBuild-${CI_COMMIT_SHORT_SHA}-${CI_COMMIT_TIMESTAMP}_18-1"  
+        paths:
+            # relative to the root directory
+            - Merged
+        expire_in: 1 day
+
+
+
 ## - stage
 #deploy:
 #    stage: deploy