From 6e1cf90ef3d52c77b7035fa24dcaf63d430bc149 Mon Sep 17 00:00:00 2001 From: solonovamax Date: Sun, 29 Nov 2020 18:06:32 -0500 Subject: [PATCH] maybe this will work? Signed-off-by: solonovamax --- .github/workflows/build.yml | 2 +- build.gradle.kts | 42 ++++++++++++++++++------------------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 32ccb39f4..cd8cc9302 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,7 +21,7 @@ jobs: java-version: 1.8 - name: Build Terra - run: gradle shadowJar + run: ./gradlew build -x test && ./gradlew build -x test - name: Upload artifacts uses: actions/upload-artifact@v2 diff --git a/build.gradle.kts b/build.gradle.kts index 501fdf812..e52e0b2e5 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -65,27 +65,6 @@ dependencies { val compileJava: JavaCompile by tasks val mainSourceSet: SourceSet = sourceSets["main"] -val downloadDefaultPacks = tasks.create("downloadDefaultPacks") { - doFirst { - file("${buildDir}/resources/main/packs/").deleteRecursively() - - val defaultPackUrl = URL("https://github.com/PolyhedralDev/TerraDefaultConfig/releases/download/latest/default.zip") - downloadAndUnzipPack(defaultPackUrl) - val netherPackUrl = URL("https://github.com/PolyhedralDev/TerraDefaultConfig/releases/download/latest/nether.zip") - downloadAndUnzipPack(netherPackUrl) - } - - file("${buildDir}/resources/main/packs/").deleteRecursively() - - val defaultPackUrl = URL("https://github.com/PolyhedralDev/TerraDefaultConfig/releases/download/latest/default.zip") - downloadAndUnzipPack(defaultPackUrl) - val netherPackUrl = URL("https://github.com/PolyhedralDev/TerraDefaultConfig/releases/download/latest/nether.zip") - downloadAndUnzipPack(netherPackUrl) -} -tasks.compileJava { - dependsOn(downloadDefaultPacks) -} - val tokenizeJavaSources = task(name = "tokenizeJavaSources") { from(mainSourceSet.allSource) { include("**/plugin.yml") @@ -117,6 +96,27 @@ tasks.test { maxParallelForks = 12 } +val downloadDefaultPacks = tasks.create("downloadDefaultPacks") { + doFirst { + file("${buildDir}/resources/main/packs/").deleteRecursively() + + val defaultPackUrl = URL("https://github.com/PolyhedralDev/TerraDefaultConfig/releases/download/latest/default.zip") + downloadAndUnzipPack(defaultPackUrl) + val netherPackUrl = URL("https://github.com/PolyhedralDev/TerraDefaultConfig/releases/download/latest/nether.zip") + downloadAndUnzipPack(netherPackUrl) + } + + file("${buildDir}/resources/main/packs/").deleteRecursively() + + val defaultPackUrl = URL("https://github.com/PolyhedralDev/TerraDefaultConfig/releases/download/latest/default.zip") + downloadAndUnzipPack(defaultPackUrl) + val netherPackUrl = URL("https://github.com/PolyhedralDev/TerraDefaultConfig/releases/download/latest/nether.zip") + downloadAndUnzipPack(netherPackUrl) +} +tasks.compileJava { + dependsOn(downloadDefaultPacks) +} + tasks.named("shadowJar") { from(tokenizeJavaSources.destinationDir) dependsOn(downloadDefaultPacks)