mirrors/Terra
1
0
Fork 0
mirror of https://github.com/PolyhedralDev/Terra.git synced 2025-07-04 00:45:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'gh-builds'

Browse Source
This commit is contained in:
solonovamax 2020-11-29 18:07:42 -05:00
commit 853ac3894f
No known key found for this signature in database
GPG Key ID: ED0FC2D44CD76482
2 changed files with 36 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.github/workflows/build.yml vendored
View File

@ -21,7 +21,7 @@ jobs:
java-version: 1.8 java-version: 1.8
- name: Build Terra - name: Build Terra
run: gradle shadowJar run: ./gradlew build -x test && ./gradlew build -x test
- name: Upload artifacts - name: Upload artifacts
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v2
@ -35,6 +35,5 @@ jobs:
repo_token: ${{ secrets.GITHUB_TOKEN }} repo_token: ${{ secrets.GITHUB_TOKEN }}
prerelease: false prerelease: false
files: | files: |
build/libs/Terra-*.jar build/libs/Terra-*-shaded.jar
LICENSE

53
build.gradle.kts
View File

@ -96,10 +96,32 @@ tasks.test {
maxParallelForks = 12 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") { tasks.named<ShadowJar>("shadowJar") {
from(tokenizeJavaSources.destinationDir) from(tokenizeJavaSources.destinationDir)
dependsOn(downloadDefaultPacks)
archiveClassifier.set("") archiveClassifier.set("shaded")
archiveBaseName.set("Terra") archiveBaseName.set("Terra")
setVersion(project.version) setVersion(project.version)
relocate("org.apache.commons", "com.dfsek.terra.lib.commons") 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("parsii", "com.dfsek.terra.lib.parsii")
relocate("io.papermc.lib", "com.dfsek.terra.lib.paperlib") relocate("io.papermc.lib", "com.dfsek.terra.lib.paperlib")
relocate("net.jafama", "com.dfsek.terra.lib.jafama") relocate("net.jafama", "com.dfsek.terra.lib.jafama")
minimize() minimize {
exclude(project(":"))
} }
tasks.build {
dependsOn(tasks.shadowJar)
// dependsOn(testWithPaper)
// testWithPaper.mustRunAfter(tasks.shadowJar)
} }
val testDir = "target/server/" val testDir = "target/server/"
@ -152,21 +170,14 @@ val setupServer = tasks.create("setupServer") {
} }
} }
val downloadDefaultPacks = tasks.create("downloadDefaultPacks") { tasks.build {
doFirst { dependsOn(tasks.shadowJar)
// Downloading latest paper jar. dependsOn(downloadDefaultPacks)
// if (file("${buildDir}/resources/main/packs/default").exists() && file("${buildDir}/resources/main/packs/nether").exists()) tasks.shadowJar.get().mustRunAfter(downloadDefaultPacks)
// return@doFirst // dependsOn(testWithPaper)
// else // testWithPaper.mustRunAfter(tasks.shadowJar)
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.processResources.get().dependsOn(downloadDefaultPacks)
val testWithPaper = task<JavaExec>(name = "testWithPaper") { val testWithPaper = task<JavaExec>(name = "testWithPaper") {
standardInput = System.`in` standardInput = System.`in`