From 91712cee2adb77f54faf7c5eba41693a3d28cb12 Mon Sep 17 00:00:00 2001
From: James Seibel <jeseibel@gondtc.com>
Date: Tue, 15 Mar 2022 03:21:44 +0000
Subject: [PATCH] Rough artifact test

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6b19f0c60..57277495f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,12 +3,13 @@ image: gradle:eclipse-temurin
 
 # all stages need to be defined here
 stages:
-  - gradleSetup
-  - build_18-1
-  - build_18-2
+  #- gradleSetup
+  #- build_18-1
+  #- build_18-2
+  - artifacts
 
 variables:
-    # Let's see if setting this to true will improve speed any
+    # If we have correctness issues when compiling this can be set to false
     GRADLE_OPTS: "-Dorg.gradle.daemon=true"
     # Pull core when building
     GIT_SUBMODULE_STRATEGY: recursive
@@ -22,55 +23,17 @@ before_script:
 
 
 
-# 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
-    script: ./gradlew build -PmcVer=1.18.1 --gradle-user-home cache/; ./gradlew merge --gradle-user-home cache/
-    # build using Java 17
-    image: eclipse-temurin:17
-    cache:
-        key: "$CI_COMMIT_REF_NAME_18-1"
-        policy: pull-push
-        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
-build_18-2:
+# put artifacts in a zip
+artifacts:
     stage: build_18-2
-    script: ./gradlew build -PmcVer=1.18.2 --gradle-user-home cache/; ./gradlew merge --gradle-user-home cache/
+    script: echo 'Building complete. Creating artifact Zip.'
     # build using Java 17
     image: eclipse-temurin:17
-    cache:
-        key: "$CI_COMMIT_REF_NAME_18-2"
-        policy: pull-push
-        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"  
@@ -81,7 +44,7 @@ build_18-2:
 
 
 
-## - stage
+# unused deployment stage
 #deploy:
 #    stage: deploy
 #    image: registry.gitlab.com/gitlab-org/release-cli:latest