From 980ce2f2afd553f33148ab8a60dcc5b272a48a27 Mon Sep 17 00:00:00 2001
From: James Seibel <jeseibel@gondtc.com>
Date: Tue, 22 Mar 2022 03:14:25 +0000
Subject: [PATCH] Go back to parallel builds And potentially fix the caching

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a15cfae1a..c9c72445d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,8 +3,7 @@ image: gradle:eclipse-temurin
 
 # all stages need to be defined here
 stages:
-  - build_18-1
-  - build_18-2
+  - build
 
 variables:
     # If we have correctness issues when compiling this can be set to false
@@ -15,12 +14,10 @@ variables:
 
 before_script:
     - echo $CI_JOB_ID
-    # Writing GE_JOB_ID variable to environment file, will need the value in the next stage.
-    - echo GE_JOB_ID=$CI_JOB_ID >> generate_jars.env
 
 
 # 1.18.1 build 
-build_18-1: # build compile_18_1 1/2:
+build compile_18_1 1/2:
     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
@@ -28,7 +25,7 @@ build_18-1: # build compile_18_1 1/2:
     cache:
         # The cached folders should only be used for this job.
         # This prevents jobs from using the same folder(s) and overwriting each other
-        key: "$CI_COMMIT_REF_NAME_18-1"
+        key: "$CI_JOB_ID_18-1"
         policy: pull-push
         paths:
             - .gradle
@@ -42,12 +39,12 @@ build_18-1: # build compile_18_1 1/2:
       expire_in: 1 day
 
 # 1.18.2 build
-build_18-2: #build compile_18_2 2/2:
+build compile_18_2 2/2:
     stage: build_18-2
     script: ./gradlew build -PmcVer=1.18.2 --gradle-user-home cache/; ./gradlew merge --gradle-user-home cache/
     image: eclipse-temurin:17
     cache:
-        key: "$CI_COMMIT_REF_NAME_18-2"
+        key: "$CI_JOB_ID_18-2"
         policy: pull-push
         paths:
             - .gradle