From 207cab9a0f00def0055434bdd01e8847b7a35fe4 Mon Sep 17 00:00:00 2001
From: James Seibel <jeseibel@gondtc.com>
Date: Tue, 15 Mar 2022 04:05:12 +0000
Subject: [PATCH] Clean up the build script

---
 .gitlab-ci.yml | 31 ++++++++++++++++++++-----------
 1 file changed, 20 insertions(+), 11 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c7b0b49ca..b7a32635e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,7 +5,7 @@ image: gradle:eclipse-temurin
 stages:
   - build_18-1
   - build_18-2
-  - zip_artifacts
+#   - zip_artifacts
 
 variables:
     # If we have correctness issues when compiling this can be set to false
@@ -46,16 +46,8 @@ build_18-2:
         paths:
             - .gradle
             - cache/
-
-
-# put artifacts in a zip
-# This should only be done after all the builds have been completed
-zip_artifacts:
-    stage: zip_artifacts
-    # The complier complains if we don't do something with the script line 
-    script: echo 'Building complete. Creating artifact Zip.'
-    # build using Java 17
-    image: eclipse-temurin:17
+    
+    # TEMPORARY, there should be a way of either generating artifacts per build or in a separate stage
     artifacts:
         # This should only be done after the last build, otherwise there will be duplicate jars
         name: "Merged_NightlyBuild-${CI_COMMIT_SHORT_SHA}-${CI_COMMIT_TIMESTAMP}"
@@ -65,6 +57,23 @@ zip_artifacts:
         expire_in: 1 day
 
 
+# # put artifacts in a zip
+# # This should only be done after all the builds have been completed
+# zip_artifacts:
+#     stage: zip_artifacts
+#     # The complier complains if we don't do something with the script line 
+#     script: echo 'Building complete. Creating artifact Zip.'
+#     # build using Java 17
+#     image: eclipse-temurin:17
+#     artifacts:
+#         # This should only be done after the last build, otherwise there will be duplicate jars
+#         name: "Merged_NightlyBuild-${CI_COMMIT_SHORT_SHA}-${CI_COMMIT_TIMESTAMP}"
+#         paths:
+#             # relative to the root directory
+#             - Merged
+#         expire_in: 1 day
+
+
 
 # unused deployment stage
 #deploy: