From b9608498a2dab1ea50d1e8065623f579c5162f40 Mon Sep 17 00:00:00 2001
From: James Seibel <jeseibel@gondtc.com>
Date: Tue, 15 Mar 2022 03:34:29 +0000
Subject: [PATCH] Check if Gradle setup is necessary + fix artifacts not being
 populated

---
 .gitlab-ci.yml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ae334acad..b32add01b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,7 +6,7 @@ stages:
 #   - gradleSetup
   - build_18-1
   - build_18-2
-  - artifacts
+#   - artifacts
 
 variables:
     # If we have correctness issues when compiling this can be set to false
@@ -63,6 +63,13 @@ build_18-2:
         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-2"  
+        paths:
+            # relative to the root directory
+            - Merged
+        expire_in: 1 day
 
 
 # put artifacts in a zip