mirror of
https://github.com/VolmitSoftware/Iris.git
synced 2026-10-23 16:44:06 +00:00
Trimmed unused build work
- Limited SlimJar generation to shaded core artifacts - Honored configured mod test fork limits - Set Forge targets to four test JVMs
This commit is contained in:
1 parent
5e02c5efdd
commit
0eb661f14d
3 files changed
+14
-5
No files matched your search
+11
-2
@@ -1,4 +1,5 @@
|
||||
import groovy.json.JsonSlurper
|
||||
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
|
||||
import io.github.slimjar.resolver.data.Mirror
|
||||
import org.gradle.api.attributes.java.TargetJvmVersion
|
||||
import org.gradle.api.file.FileTreeElement
|
||||
@@ -198,8 +199,16 @@ slimJar {
|
||||
}
|
||||
}
|
||||
|
||||
TaskProvider<Task> slimJarTask = tasks.named('slimJar')
|
||||
tasks.withType(ShadowJar).configureEach {
|
||||
dependsOn(slimJarTask)
|
||||
}
|
||||
|
||||
def embeddedAgentJar = project(':core:agent').tasks.named('jar', Jar)
|
||||
tasks.named('processResources').configure {
|
||||
tasks.named('processResources').configure { Task resources ->
|
||||
resources.setFinalizedBy(resources.finalizedBy.getDependencies(resources).findAll { Task finalizer ->
|
||||
finalizer != slimJarTask.get()
|
||||
})
|
||||
from(embeddedAgentJar.map { it.archiveFile }) {
|
||||
rename { String ignored -> 'agent.jar' }
|
||||
}
|
||||
@@ -460,7 +469,7 @@ List<String> dependencyBuildMetadata = [
|
||||
|
||||
String languageTomlSupportClassPattern = 'art/arcane/volmlib/util/config/(?:TomlCodec|ConfigJson|ConfigExposePolicy|ConfigDoc|ConfigDescription|ConfigDocumentation)(?:\\$[^/]+)?\\.class'
|
||||
|
||||
tasks.named('shadowJar', com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar).configure {
|
||||
tasks.named('shadowJar', ShadowJar).configure {
|
||||
inputs.property('languageTomlSupportClassPattern', languageTomlSupportClassPattern)
|
||||
dependsOn(embeddedAgentJar)
|
||||
mergeServiceFiles()
|
||||
|
||||
@@ -8,8 +8,8 @@ tasks.named('compileTestJava', JavaCompile).configure {
|
||||
options.release.set((int) irisModTarget.java)
|
||||
}
|
||||
tasks.withType(Test).configureEach {
|
||||
maxParallelForks = Math.min(2, Math.min(Runtime.runtime.availableProcessors(),
|
||||
Math.min(gradle.startParameter.maxWorkerCount, testForks)))
|
||||
maxParallelForks = Math.min(Runtime.runtime.availableProcessors(),
|
||||
Math.min(gradle.startParameter.maxWorkerCount, testForks))
|
||||
if (gradle.extensions.extraProperties.has('irisBuildLane')) {
|
||||
jvmArgs('-XX:ParallelGCThreads=2', '-XX:ConcGCThreads=1', '-XX:CICompilerCount=2')
|
||||
}
|
||||
|
||||
@@ -60,7 +60,7 @@ gradle.projectsEvaluated {
|
||||
buildTargets.add([
|
||||
id: "${loader}-${minecraft}".toString(),
|
||||
tasks: [":verify${label}${minecraft.replace('.', '_')}".toString()],
|
||||
arguments: ['-PmoddedBuildParallelism=1', "-PmoddedTestForks=${forge ? 2 : 1}".toString(),
|
||||
arguments: ['-PmoddedBuildParallelism=1', "-PmoddedTestForks=${forge ? 4 : 1}".toString(),
|
||||
'-PmultiplexorSandbox=true'],
|
||||
java: 25,
|
||||
memoryMiB: forge ? 16384 : 8192,
|
||||
|
||||
Reference in new issue
Block a user