From c80b025ac187a1946cb6699f3bfa8fd8deee7096 Mon Sep 17 00:00:00 2001
From: James Seibel <jeseibel@gondtc.com>
Date: Tue, 15 Mar 2022 03:52:25 +0000
Subject: [PATCH] Clean up the build script

---
 .gitlab-ci.yml | 55 ++++++++++++--------------------------------------
 1 file changed, 13 insertions(+), 42 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7e0aa9263..c7b0b49ca 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,10 +3,9 @@ image: gradle:eclipse-temurin
 
 # all stages need to be defined here
 stages:
-#   - gradleSetup
   - build_18-1
   - build_18-2
-#   - artifacts
+  - zip_artifacts
 
 variables:
     # If we have correctness issues when compiling this can be set to false
@@ -21,22 +20,6 @@ before_script:
     - echo GE_JOB_ID=$CI_JOB_ID >> generate_jars.env
 
 
-# # This prevents us from re-downloading Gradle every stage
-# gradleSetup:
-#     stage: gradleSetup
-#     script: ./gradlew --build-cache --gradle-user-home cache/ check
-#     # build using Java 17
-#     image: eclipse-temurin:17
-#     cache:
-#         key:
-#           files:
-#             - gradle/wrapper/gradle-wrapper.properties 
-#         policy: push
-#         paths:
-#           - cache/
-
-
-
 # 1.18.1 build
 build_18-1:
     stage: build_18-1
@@ -49,12 +32,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
@@ -69,31 +46,25 @@ 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
     artifacts:
-        name: "Merged_NightlyBuild-${CI_COMMIT_SHORT_SHA}-${CI_COMMIT_TIMESTAMP}_18-2"  
+        # 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
 
 
-# # put artifacts in a zip
-# # This should only be done after all the builds have been completed
-# artifacts:
-#     stage: 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 for 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: