ObsidianMC/nugget
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat(userdev): Enable shared caches by default (#235)

Browse source 
* userdev: Enable shared caches by default

* Ignore locks for non-existent processes in cleanup

* 1.7.0-SNAPSHOT
This commit is contained in:
Jason Penilla 2024-04-30 17:23:33 -07:00 committed by GitHub
parent b26c85b988
commit f964c5bc0b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 24 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gradle.properties
View file

@ -1,5 +1,5 @@
group = io.papermc.paperweight
version = 1.6.4-SNAPSHOT
version = 1.7.0-SNAPSHOT
org.gradle.caching = true
org.gradle.parallel = true

31
paperweight-userdev/src/main/kotlin/io/papermc/paperweight/userdev/PaperweightUser.kt
View file

@ -45,8 +45,6 @@ import org.gradle.api.attributes.Bundling
import org.gradle.api.attributes.Category
import org.gradle.api.attributes.LibraryElements
import org.gradle.api.attributes.Usage
import org.gradle.api.logging.Logger
import org.gradle.api.logging.Logging
import org.gradle.api.plugins.JavaPlugin
import org.gradle.api.provider.Provider
import org.gradle.api.tasks.Delete
@ -57,9 +55,6 @@ import org.gradle.util.internal.NameMatcher
import org.gradle.workers.WorkerExecutor
abstract class PaperweightUser : Plugin<Project> {
companion object {
private val logger: Logger = Logging.getLogger(PaperweightUser::class.java)
}
@get:Inject
abstract val workerExecutor: WorkerExecutor
@ -70,32 +65,26 @@ abstract class PaperweightUser : Plugin<Project> {
override fun apply(target: Project) {
checkJavaVersion()
val sharedCacheRootRoot = target.gradle.gradleUserHomeDir.toPath().resolve("caches/paperweight-userdev")
val sharedCacheRoot = if (target.sharedCaches) {
logger.lifecycle("paperweight-userdev experimental shared caches are enabled.")
sharedCacheRootRoot.resolve(paperweightHash)
} else {
null
}
val sharedCacheRoot = target.gradle.gradleUserHomeDir.toPath().resolve("caches/paperweight-userdev")
target.gradle.sharedServices.registerIfAbsent(DOWNLOAD_SERVICE_NAME, DownloadService::class) {}
val cleanAll = target.tasks.register<Delete>("cleanAllPaperweightUserdevCaches") {
group = "paperweight"
description = "Delete the project & all shared paperweight-userdev setup cache."
description = "Delete the project-local & all shared paperweight-userdev setup caches."
delete(target.layout.cache)
delete(sharedCacheRootRoot)
delete(sharedCacheRoot)
}
val cleanCache by target.tasks.registering<Delete> {
group = "paperweight"
description = "Delete the project paperweight-userdev setup cache."
description = "Delete the project-local paperweight-userdev setup cache."
delete(target.layout.cache)
}
target.configurations.register(DEV_BUNDLE_CONFIG)
// must not be initialized until afterEvaluate, as it resolves the dev bundle
val userdevSetup by lazy { createSetup(target, sharedCacheRoot) }
val userdevSetup by lazy { createSetup(target, sharedCacheRoot.resolve(paperweightHash)) }
val userdev = target.extensions.create(
PAPERWEIGHT_EXTENSION,
@ -176,7 +165,7 @@ abstract class PaperweightUser : Plugin<Project> {
configureRepositories(userdevSetup)
cleanSharedCaches(this, sharedCacheRootRoot)
cleanSharedCaches(this, sharedCacheRoot)
}
}
@ -307,17 +296,15 @@ abstract class PaperweightUser : Plugin<Project> {
private fun createContext(project: Project): SetupHandler.Context =
SetupHandler.Context(project, workerExecutor, javaToolchainService)
private fun createSetup(target: Project, sharedCacheRoot: Path?): UserdevSetup {
private fun createSetup(target: Project, sharedCacheRoot: Path): UserdevSetup {
val bundleConfig = target.configurations.named(DEV_BUNDLE_CONFIG)
val devBundleZip = bundleConfig.map { it.singleFile }.convertToPath()
val bundleHash = devBundleZip.sha256asHex()
val cacheDir = if (sharedCacheRoot == null) {
val cacheDir = if (!target.sharedCaches) {
target.layout.cache
} else {
when (bundleConfig.get().dependencies.single()) {
is ProjectDependency -> {
throw PaperweightException("Shared caches does not support the dev bundle being a ProjectDependency.")
}
is ProjectDependency -> target.layout.cache
is ModuleDependency -> {
val resolved =

18
paperweight-userdev/src/main/kotlin/io/papermc/paperweight/userdev/internal/setup/util/utils.kt
View file

@ -172,6 +172,8 @@ val Project.ci: Provider<Boolean>
.map { it.toBoolean() }
.orElse(false)
private fun stableProp(name: String) = "paperweight.$name"
private fun experimentalProp(name: String) = "paperweight.experimental.$name"
val Project.genSources: Boolean
@ -182,9 +184,12 @@ val Project.genSources: Boolean
}
val Project.sharedCaches: Boolean
get() = providers.gradleProperty(experimentalProp("sharedCaches")).orNull.toBoolean()
get() = providers.gradleProperty(stableProp("sharedCaches"))
.map { it.toBoolean() }
.orElse(true)
.get()
private fun deleteUnusedAfter(target: Project): Long = target.providers.gradleProperty(experimentalProp("sharedCaches.deleteUnusedAfter"))
private fun deleteUnusedAfter(target: Project): Long = target.providers.gradleProperty(stableProp("sharedCaches.deleteUnusedAfter"))
.map { value -> parseDuration(value) }
.orElse(Duration.ofDays(7))
.map { duration -> duration.toMillis() }
@ -200,11 +205,16 @@ fun cleanSharedCaches(target: Project, root: Path) {
stream.asSequence()
.filter { it.name == "last-used.txt" }
.mapNotNull {
val dir = it.parent.parent // paperweight dir
val pwDir = it.parent.parent // paperweight dir
val cacheDir = pwDir.parent // cache dir
val lock = cacheDir.resolve(USERDEV_SETUP_LOCK)
if (lock.exists() && ProcessHandle.of(lock.readText().toLong()).isPresent) {
return@mapNotNull null
}
val lastUsed = it.readText().toLong()
val since = System.currentTimeMillis() - lastUsed
val cutoff = deleteUnusedAfter(target)
if (since > cutoff) dir else null
if (since > cutoff) pwDir else null
}
.toList()
}