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

Loader task freshness

Browse Source 
- Always rerun the loader Exec tasks when VolmLib resolves from the published snapshot
- Read the VolmLib dirty state without taking the optional index lock
This commit is contained in:
Brian Neumann-Fopiano
2026-09-29 09:50:38 -04:00
parent 8d28ad4111
commit 15826162b4
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build.gradle
+12 -2
View File
@@ -323,6 +323,16 @@ if (localVolmLibCheckout != null) {
}) })
} }
// The published master-SNAPSHOT is resolved inside the nested build, so no outer input changes when it
// moves. Without a local checkout the Exec tasks always run and the nested build decides what is stale.
Closure<Void> declareVolmLibInputs = { Exec task ->
task.inputs.property('volmLibStamp', volmLibStamp)
if (localVolmLibCheckout == null) {
task.outputs.upToDateWhen { false }
}
return null
}
Closure<Void> declareModdedJarIo = { Exec task, String adapter, String artifactName, Map<String, String> versions -> Closure<Void> declareModdedJarIo = { Exec task, String adapter, String artifactName, Map<String, String> versions ->
task.inputs.files(moddedSharedInputs).withPropertyName('moddedSharedSources') task.inputs.files(moddedSharedInputs).withPropertyName('moddedSharedSources')
.withPathSensitivity(PathSensitivity.RELATIVE) .withPathSensitivity(PathSensitivity.RELATIVE)
@@ -332,7 +342,7 @@ Closure<Void> declareModdedJarIo = { Exec task, String adapter, String artifactN
layout.projectDirectory.file("adapters/${adapter}/settings.gradle").asFile layout.projectDirectory.file("adapters/${adapter}/settings.gradle").asFile
).withPropertyName('adapterSources') ).withPropertyName('adapterSources')
versions.each { String key, String value -> task.inputs.property(key, value) } versions.each { String key, String value -> task.inputs.property(key, value) }
task.inputs.property('volmLibStamp', volmLibStamp) declareVolmLibInputs(task)
task.outputs.file(layout.projectDirectory.file("adapters/${adapter}/build/libs/${artifactName}")) task.outputs.file(layout.projectDirectory.file("adapters/${adapter}/build/libs/${artifactName}"))
return null return null
} }
@@ -495,7 +505,7 @@ tasks.register('moddedTest', Exec) {
inputs.property('irisVersion', project.version.toString()) inputs.property('irisVersion', project.version.toString())
inputs.property('minecraftVersion', minecraftVersion) inputs.property('minecraftVersion', minecraftVersion)
inputs.property('fabricLoaderVersion', fabricLoaderVersion) inputs.property('fabricLoaderVersion', fabricLoaderVersion)
inputs.property('volmLibStamp', volmLibStamp) declareVolmLibInputs(it)
outputs.dir(layout.projectDirectory.dir('adapters/fabric/build/test-results/test')) outputs.dir(layout.projectDirectory.dir('adapters/fabric/build/test-results/test'))
mustRunAfter(tasks.named('jar')) mustRunAfter(tasks.named('jar'))
mustRunAfter(project(':core').tasks.named('check')) mustRunAfter(project(':core').tasks.named('check'))
gradle/volmlib-resolution.settings.gradle
+1 -1
View File
@@ -121,7 +121,7 @@ if (irisLocalVolmLibDirectory == null) {
} }
} else { } else {
String commit = irisGit(irisLocalVolmLibDirectory, 'rev-parse', 'HEAD') String commit = irisGit(irisLocalVolmLibDirectory, 'rev-parse', 'HEAD')
String status = commit == null ? null : irisGit(irisLocalVolmLibDirectory, 'status', '--porcelain') String status = commit == null ? null : irisGit(irisLocalVolmLibDirectory, '--no-optional-locks', 'status', '--porcelain')
String dirty = status == null ? 'unknown' : String.valueOf(!status.isEmpty()) String dirty = status == null ? 'unknown' : String.valueOf(!status.isEmpty())
irisVolmLibStamp = [source: 'local', commit: commit ?: 'unknown', dirty: dirty] irisVolmLibStamp = [source: 'local', commit: commit ?: 'unknown', dirty: dirty]
irisVolmLibDescription = "${irisLocalVolmLibDirectory.canonicalPath} @ ${commit == null ? 'unknown' : commit.take(7)}${dirty == 'true' ? '+dirty' : ''}" irisVolmLibDescription = "${irisLocalVolmLibDirectory.canonicalPath} @ ${commit == null ? 'unknown' : commit.take(7)}${dirty == 'true' ? '+dirty' : ''}"