Check if Gradle setup is necessary + fix artifacts not being populated

.gitlab-ci.yml

@@ -6,7 +6,7 @@ stages:
 #   - gradleSetup
   - build_18-1
   - build_18-2
-  - artifacts
+#   - artifacts
 
 variables:
     # If we have correctness issues when compiling this can be set to false
@@ -63,6 +63,13 @@ build_18-2:
         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"  
+        paths:
+            # relative to the root directory
+            - Merged
+        expire_in: 1 day
 
 
 # put artifacts in a zip