Compare commits

...

8 Commits

Author SHA1 Message Date
solonovamax 6e1cf90ef3 maybe this will work?
Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>
2020-11-29 18:06:32 -05:00
solonovamax 4dc1c96baa Move download task up, maybe this will fix?
Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>
2020-11-29 16:55:09 -05:00
solonovamax de3b9ea7ad possibly fix issue with not downloading packs in time
Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>
2020-11-24 20:33:22 -05:00
solonovamax d1592422ea configure build task
Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>
2020-11-24 20:26:28 -05:00
solonovamax 028765c91b Run download packs before compile
Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>
2020-11-24 20:09:23 -05:00
solonovamax b3e43321b5 Maybe fix issues with jar not including pack.
Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>
2020-11-24 19:46:31 -05:00
solonovamax 76d3e29d55 specify to upload shaded jar
Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>
2020-11-24 19:33:47 -05:00
solonovamax 06a13f8757 Action (should work)
Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>
2020-11-24 18:26:47 -05:00
2 changed files with 72 additions and 22 deletions
+39
View File
@@ -0,0 +1,39 @@
# This workflow will build a Java project with Gradle
# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle
name: Java CI with Gradle
on:
push:
tags:
- "v*" # Push events to matching v*, i.e. v1.0, v20.15.10
jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Set up JDK 1.8
uses: actions/setup-java@v1
with:
java-version: 1.8
- name: Build Terra
run: ./gradlew build -x test && ./gradlew build -x test
- name: Upload artifacts
uses: actions/upload-artifact@v2
with:
name: Package
path: build/libs
- name: Publish release
uses: marvinpinto/action-automatic-releases@latest
with:
repo_token: ${{ secrets.GITHUB_TOKEN }}
prerelease: false
files: |
build/libs/Terra-*-shaded.jar
+33 -22
View File
@@ -96,10 +96,32 @@ 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>("shadowJar") {
from(tokenizeJavaSources.destinationDir)
dependsOn(downloadDefaultPacks)
archiveClassifier.set("")
archiveClassifier.set("shaded")
archiveBaseName.set("Terra")
setVersion(project.version)
relocate("org.apache.commons", "com.dfsek.terra.lib.commons")
@@ -107,13 +129,9 @@ tasks.named<ShadowJar>("shadowJar") {
relocate("parsii", "com.dfsek.terra.lib.parsii")
relocate("io.papermc.lib", "com.dfsek.terra.lib.paperlib")
relocate("net.jafama", "com.dfsek.terra.lib.jafama")
minimize()
}
tasks.build {
dependsOn(tasks.shadowJar)
// dependsOn(testWithPaper)
// testWithPaper.mustRunAfter(tasks.shadowJar)
minimize {
exclude(project(":"))
}
}
val testDir = "target/server/"
@@ -152,21 +170,14 @@ val setupServer = tasks.create("setupServer") {
}
}
val downloadDefaultPacks = tasks.create("downloadDefaultPacks") {
doFirst {
// Downloading latest paper jar.
// if (file("${buildDir}/resources/main/packs/default").exists() && file("${buildDir}/resources/main/packs/nether").exists())
// return@doFirst
// else
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.build {
dependsOn(tasks.shadowJar)
dependsOn(downloadDefaultPacks)
tasks.shadowJar.get().mustRunAfter(downloadDefaultPacks)
// dependsOn(testWithPaper)
// testWithPaper.mustRunAfter(tasks.shadowJar)
}
tasks.processResources.get().dependsOn(downloadDefaultPacks)
val testWithPaper = task<JavaExec>(name = "testWithPaper") {
standardInput = System.`in`