From 5adfbb2dee7f7e44245b4ad0df68e1549f9f2fa5 Mon Sep 17 00:00:00 2001
From: James Seibel <jeseibel@gondtc.com>
Date: Tue, 15 Mar 2022 03:04:50 +0000
Subject: [PATCH] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b95b3fdc1..6b19f0c60 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,7 +6,6 @@ stages:
   - gradleSetup
   - build_18-1
   - build_18-2
-  - archive
 
 variables:
     # Let's see if setting this to true will improve speed any
@@ -51,6 +50,13 @@ build_18-1:
         paths:
             - .gradle
             - cache/
+    artifacts:
+        # This should only be done for the last build, otherwise there will be duplicate jars
+        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
@@ -65,17 +71,9 @@ build_18-2:
         paths:
             - .gradle
             - cache/
-
-
-# should be done after the builds
-# creates the archive zip containing all the built jars
-archive:
-    stage: archive
-    script:
-        - echo 'Builds finished, creating archive.' # The compiler complains if we don't give it a "script" line
     artifacts:
         # This should only be done for the last build, otherwise there will be duplicate jars
-        name: "Merged_NightlyBuild-${CI_COMMIT_SHORT_SHA}-${CI_COMMIT_TIMESTAMP}"  
+        name: "Merged_NightlyBuild-${CI_COMMIT_SHORT_SHA}-${CI_COMMIT_TIMESTAMP}_18-2"  
         paths:
             # relative to the root directory
             - Merged