mirrors/Iris
1
0 Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2026-10-26 05:50:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improved Iris build scheduling

Browse Source 
- Resolved SlimJar only for shaded core artifacts
- Applied bounded parallel Forge test execution
This commit is contained in:
Brian Neumann-Fopiano committed 2026-10-21 08:27:49 -04:00
2 parents 5e02c5efdd 49f7d11442
commit 463feea60b
3 files changed
+14 -5
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

core/build.gradle
+11 -2
View File
@@ -1,4 +1,5 @@
import groovy.json.JsonSlurper import groovy.json.JsonSlurper
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
import io.github.slimjar.resolver.data.Mirror import io.github.slimjar.resolver.data.Mirror
import org.gradle.api.attributes.java.TargetJvmVersion import org.gradle.api.attributes.java.TargetJvmVersion
import org.gradle.api.file.FileTreeElement 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) 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 }) { from(embeddedAgentJar.map { it.archiveFile }) {
rename { String ignored -> 'agent.jar' } 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' 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) inputs.property('languageTomlSupportClassPattern', languageTomlSupportClassPattern)
dependsOn(embeddedAgentJar) dependsOn(embeddedAgentJar)
mergeServiceFiles() mergeServiceFiles()
gradle/modded-version-sources.gradle
+2 -2
View File
@@ -8,8 +8,8 @@ tasks.named('compileTestJava', JavaCompile).configure {
options.release.set((int) irisModTarget.java) options.release.set((int) irisModTarget.java)
} }
tasks.withType(Test).configureEach { tasks.withType(Test).configureEach {
maxParallelForks = Math.min(2, Math.min(Runtime.runtime.availableProcessors(), maxParallelForks = Math.min(Runtime.runtime.availableProcessors(),
Math.min(gradle.startParameter.maxWorkerCount, testForks))) Math.min(gradle.startParameter.maxWorkerCount, testForks))
if (gradle.extensions.extraProperties.has('irisBuildLane')) { if (gradle.extensions.extraProperties.has('irisBuildLane')) {
jvmArgs('-XX:ParallelGCThreads=2', '-XX:ConcGCThreads=1', '-XX:CICompilerCount=2') jvmArgs('-XX:ParallelGCThreads=2', '-XX:ConcGCThreads=1', '-XX:CICompilerCount=2')
} }
gradle/multiplexor.gradle
+1 -1
View File
@@ -60,7 +60,7 @@ gradle.projectsEvaluated {
buildTargets.add([ buildTargets.add([
id: "${loader}-${minecraft}".toString(), id: "${loader}-${minecraft}".toString(),
tasks: [":verify${label}${minecraft.replace('.', '_')}".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'], '-PmultiplexorSandbox=true'],
java: 25, java: 25,
memoryMiB: forge ? 16384 : 8192, memoryMiB: forge ? 16384 : 8192,