From b14a3cd2eeccc7e432820ce352a990dc2b11b29b Mon Sep 17 00:00:00 2001
From: LimeGlass <16087552+TheLimeGlass@users.noreply.github.com>
Date: Tue, 27 Dec 2022 02:53:38 -0700
Subject: [PATCH] Set the string flavour tag of the jar in the actions
 artifacts to nightly (#4994)

---
 .github/workflows/java-17-builds.yml | 4 +---
 .github/workflows/java-8-builds.yml  | 4 +---
 .github/workflows/repo.yml           | 4 +++-
 build.gradle                         | 4 ++--
 4 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/java-17-builds.yml b/.github/workflows/java-17-builds.yml
index 8e435547f11..67007d76d90 100644
--- a/.github/workflows/java-17-builds.yml
+++ b/.github/workflows/java-17-builds.yml
@@ -23,9 +23,7 @@ jobs:
                   cache: gradle
             - name: Grant execute permission for gradlew
               run: chmod +x gradlew
-            - name: Build Skript
-              run: ./gradlew nightlyRelease
-            - name: Run test scripts
+            - name: Build Skript and run test scripts
               run: ./gradlew clean skriptTestJava17
             - name: Upload Nightly Build
               uses: actions/upload-artifact@v3
diff --git a/.github/workflows/java-8-builds.yml b/.github/workflows/java-8-builds.yml
index 6257a3ebccd..adcd71fb09b 100644
--- a/.github/workflows/java-8-builds.yml
+++ b/.github/workflows/java-8-builds.yml
@@ -23,9 +23,7 @@ jobs:
                   cache: gradle
             - name: Grant execute permission for gradlew
               run: chmod +x gradlew
-            - name: Build Skript
-              run: ./gradlew nightlyRelease
-            - name: Run test scripts
+            - name: Build Skript and run test scripts
               run: ./gradlew clean skriptTestJava8
             - name: Upload Nightly Build
               uses: actions/upload-artifact@v3
diff --git a/.github/workflows/repo.yml b/.github/workflows/repo.yml
index 1518620c7e7..d7639b98a94 100644
--- a/.github/workflows/repo.yml
+++ b/.github/workflows/repo.yml
@@ -14,7 +14,9 @@ jobs:
             - name: Set up JDK 17
               uses: actions/setup-java@v3
               with:
-                  java-version: 17
+                  java-version: '17'
+                  distribution: 'adopt'
+                  cache: gradle
             - name: Publish Skript
               run: ./gradlew publish
               env:
diff --git a/build.gradle b/build.gradle
index 07b5d5fb6f3..5c7e45d22bc 100644
--- a/build.gradle
+++ b/build.gradle
@@ -161,7 +161,7 @@ tasks.register('testNaming') {
 // Create a test task with given name, environments dir/file, dev mode and java version.
 void createTestTask(String name, String environments, boolean devMode, int javaVersion, boolean genDocs) {
 	tasks.register(name, JavaExec) {
-		dependsOn jar, testNaming
+		dependsOn nightlyRelease, testNaming
 		javaLauncher = javaToolchains.launcherFor {
 	        languageVersion = JavaLanguageVersion.of(javaVersion)
 	    }
@@ -170,7 +170,7 @@ void createTestTask(String name, String environments, boolean devMode, int javaV
 		}
 		group = 'execution'
 		classpath = files([
-			'build' + File.separator + 'libs' + File.separator + 'Skript.jar',
+			'build' + File.separator + 'libs' + File.separator + 'Skript-nightly.jar',
 			project.configurations.runtimeClasspath.find { it.name.startsWith('gson') },
 			sourceSets.main.runtimeClasspath
 		])