From b555e350160e36530a9ca2b75fe9f8bf3dcbc616 Mon Sep 17 00:00:00 2001
From: James Seibel <jeseibel@gondtc.com>
Date: Sat, 22 Jan 2022 21:58:57 -0600
Subject: [PATCH] Update jar merging pipeline

---
 .gitlab-ci.yml | 28 +++++++++++++++++++++-------
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5261fea0d..bead76dd6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,6 +3,7 @@ image: gradle:eclipse-temurin
 
 # all stages need to be defined here
 stages:
+  - gradleSetup
   - build
   - merge
 
@@ -22,7 +23,24 @@ before_script:
     - echo GE_JOB_ID=$CI_JOB_ID >> generate_jars.env
 
 
+
+
 # first stage
+gradleSetup:
+    stage: gradleSetup
+    script: ./gradlew --build-cache --gradle-user-home cache/ check
+    cache:
+        key:
+          files:
+            - gradle/wrapper/gradle-wrapper.properties 
+        paths:
+          - cache/caches/ 
+          - cache/notifications/ 
+          - cache/wrapper/ 
+
+
+
+# second stage
 build:
     stage: build
     script: ./gradlew build
@@ -48,7 +66,7 @@ build:
             - forge/run
             - build
             - .gradle
-            - .
+            - gradle
     artifacts:
         paths:
             # relative to the root directory
@@ -58,7 +76,7 @@ build:
             # To ensure we've access to these files in the next stage
             dotenv: generate_jars.env
 
-# second stage
+# third stage
 merge:
     stage: merge
     script: ./gradlew merge
@@ -86,17 +104,13 @@ merge:
             - forge/run
             - build
             - .gradle
-            - .
     artifacts:
         paths:
             # relative to the root directory
             - Merged
-        reports:
-            # To ensure we've access to this file in the next stage
-            dotenv: merged_jar.env
 
 
-## third stage
+## forth stage
 #deploy:
 #    stage: deploy
 #    image: registry.gitlab.com/gitlab-org/release-cli:latest