From 919990820e97899c59568a8e82449ca4235cee66 Mon Sep 17 00:00:00 2001
From: James Seibel <jeseibel@gondtc.com>
Date: Tue, 15 Mar 2022 02:43:12 +0000
Subject: [PATCH] Fix exporting duplicate jars

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 24ad33801..d5d4ada14 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -53,12 +53,6 @@ build_18-1:
         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
 
 
 # 1.18.2 build
@@ -74,7 +68,8 @@ build_18-2:
             - .gradle
             - cache/
     artifacts:
-        name: "Merged_NightlyBuild-${CI_COMMIT_SHORT_SHA}-${CI_COMMIT_TIMESTAMP}_18-1"  
+        # This should only be done for the last build, otherwise there will be a number of duplicate jars
+        name: "Merged_NightlyBuild-${CI_COMMIT_SHORT_SHA}-${CI_COMMIT_TIMESTAMP}"  
         paths:
             # relative to the root directory
             - Merged