Increase compiler memory and flip the compile order

.gitlab-ci.yml

@@ -6,10 +6,6 @@ stages:
   - build
 
 variables:
-    # Apparently the daemon should be enabled for gradle v 3+
-    # we'll see how that goes...
-    # https://stackoverflow.com/questions/37171043/gradle-build-daemon-disappeared-unexpectedly-it-may-have-been-killed-or-may-hav
-    GRADLE_OPTS: "-Dorg.gradle.daemon=true"
     # Pull core when building
     GIT_SUBMODULE_STRATEGY: recursive
 
@@ -20,34 +16,15 @@ before_script:
     - echo GE_JOB_ID=$CI_JOB_ID >> generate_jars.env
 
 
-# 1.18.1 build 
-build compileAndMerge_18_1 1/2:
+# 1.18.2 build 
+build compileAndMerge_18_2 1/2:
     stage: build
-    script: ./gradlew build -PmcVer=1.18.1 --gradle-user-home cache/; ./gradlew merge --gradle-user-home cache/
+    script: ./gradlew build -PmcVer=1.18.2 --gradle-user-home cache/; ./gradlew merge --gradle-user-home cache/
     # build using Java 17
     image: eclipse-temurin:17
     # cache:
     #     # The cached folders should only be used for this job.
     #     # This should prevent jobs from using the same folder(s) and overwriting each other
-    #     key: "${CI_JOB_ID}-18-1"
-    #     policy: pull-push
-    #     paths:
-    #         - .gradle
-    #         - cache/
-    #         - Merged
-    artifacts:
-      name: "Merged_NightlyBuild_1_18_1-${CI_COMMIT_SHORT_SHA}-${CI_COMMIT_TIMESTAMP}"
-      paths:
-        # relative to the root directory
-        - Merged
-      expire_in: 1 day
-
-# 1.18.2 build
-build compileAndMerge_18_2 2/2:
-    stage: build
-    script: ./gradlew build -PmcVer=1.18.2 --gradle-user-home cache/; ./gradlew merge --gradle-user-home cache/
-    image: eclipse-temurin:17
-    # cache:
     #     key: "${CI_JOB_ID}-18-2"
     #     policy: pull-push
     #     paths:
@@ -55,7 +32,26 @@ build compileAndMerge_18_2 2/2:
     #         - cache/
     #         - Merged
     artifacts:
-        name: "Merged_NightlyBuild_1_18_2-${CI_COMMIT_SHORT_SHA}-${CI_COMMIT_TIMESTAMP}"
+      name: "Merged_NightlyBuild_1_18_2-${CI_COMMIT_SHORT_SHA}-${CI_COMMIT_TIMESTAMP}"
+      paths:
+        # relative to the root directory
+        - Merged
+      expire_in: 1 day
+
+# 1.18.1 build
+build compileAndMerge_18_1 2/2:
+    stage: build
+    script: ./gradlew build -PmcVer=1.18.1 --gradle-user-home cache/; ./gradlew merge --gradle-user-home cache/
+    image: eclipse-temurin:17
+    # cache:
+    #     key: "${CI_JOB_ID}-18-1"
+    #     policy: pull-push
+    #     paths:
+    #         - .gradle
+    #         - cache/
+    #         - Merged
+    artifacts:
+        name: "Merged_NightlyBuild_1_18_1-${CI_COMMIT_SHORT_SHA}-${CI_COMMIT_TIMESTAMP}"
         paths:
             - Merged
         expire_in: 1 day

gradle.properties

@@ -1,4 +1,4 @@
-org.gradle.jvmargs=-Xmx2048M
+org.gradle.jvmargs=-Xmx4096M
 org.gradle.daemon=false
 
 maven_group=com.seibel.lod