From f665b452b028b23264391da68d1105c724df538a Mon Sep 17 00:00:00 2001
From: CodeF53 <fseusb@gmail.com>
Date: Mon, 24 Jan 2022 03:19:31 +0000
Subject: [PATCH] Don't cache old builds, uncomment jar versioning.

---
 .gitlab-ci.yml      | 8 ++++----
 fabric/build.gradle | 2 +-
 forge/build.gradle  | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2e2463bd5..fc21b8012 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -59,8 +59,6 @@ build:
             - common/build
             - core/.gradle
             - core/build
-            - fabric/build/libs
-            - forge/build/libs
             - fabric/.gradle
             - fabric/src/generated
             - forge/.gradle
@@ -68,6 +66,8 @@ build:
             - build
             - .gradle
             - cache/
+        exclude:
+            - .jar
     artifacts:
         name: "NightlyBuild-$CI_COMMIT_SHORT_SHA}-${CI_COMMIT_TIMESTAMP}"  
         paths:
@@ -97,11 +97,11 @@ merge:
         key: "$CI_COMMIT_REF_NAME"
         policy: pull-push
         paths:
-            - fabric/build/libs
-            - forge/build/libs
             - build
             - .gradle
             - cache/
+        exclude:
+            - .jar
     artifacts:
         name: "Merged_NightlyBuild-${CI_COMMIT_SHORT_SHA}-${CI_COMMIT_TIMESTAMP}"  
         paths:
diff --git a/fabric/build.gradle b/fabric/build.gradle
index ca4b5fd1d..63d4187d1 100644
--- a/fabric/build.gradle
+++ b/fabric/build.gradle
@@ -4,7 +4,7 @@ plugins {
     id "com.modrinth.minotaur" version "1.2.1"
 }
 
-//version = project.mod_version+"-"+project.minecraft_version+"-"+new Date().format("MM_dd_yyyy_HH_mm")
+version = project.mod_version+"-"+project.minecraft_version+"-"+new Date().format("MM_dd_yyyy_HH_mm")
 
 loom {
     accessWidenerPath.set(project(":common").file("src/main/resources/lod.accesswidener"))
diff --git a/forge/build.gradle b/forge/build.gradle
index 9113fa794..71b19e393 100644
--- a/forge/build.gradle
+++ b/forge/build.gradle
@@ -2,7 +2,7 @@ plugins {
     id "com.github.johnrengelman.shadow" version "7.1.0"
 }
 
-//version = project.mod_version+"-"+project.minecraft_version+"-"+new Date().format("MM_dd_yyyy_HH_mm")
+version = project.mod_version+"-"+project.minecraft_version+"-"+new Date().format("MM_dd_yyyy_HH_mm")
 
 loom {
     accessWidenerPath.set(project(":common").file("src/main/resources/lod.accesswidener"))