From 3f89f094c6c811da6a8c41c88fc549598a440b78 Mon Sep 17 00:00:00 2001 From: labkey-susanh Date: Wed, 2 Jul 2025 10:05:20 -0700 Subject: [PATCH 1/4] Issue 53067: Update `npmRunBuild` and `npmRunBuildProd` tasks to not declare outputs as they duplicate the wrapped tasks causing caching to be disabled --- README.md | 1 + build.gradle | 2 +- src/main/groovy/org/labkey/gradle/plugin/NpmRun.groovy | 2 -- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index fe6f5a7d..6f70e8af 100644 --- a/README.md +++ b/README.md @@ -16,6 +16,7 @@ on how to do that, including how to develop and test locally and the versioning ### 6.3.0-SNAPSHOT *Released*: TBD (Earliest compatible LabKey version: 25.2) +- Issue 53067: Update `npmRunBuild` and `npmRunBuildProd` tasks to not declare outputs as they duplicate the wrapped tasks causing caching to be disabled ### 6.2.0 *Released*: 23 April, 2025 diff --git a/build.gradle b/build.gradle index d61bc1b0..c25d0e0d 100644 --- a/build.gradle +++ b/build.gradle @@ -42,7 +42,7 @@ dependencies { } group = 'org.labkey.build' -project.version = "6.3.0-SNAPSHOT" +project.version = "6.3.0-npmBuild-SNAPSHOT" gradlePlugin { plugins { diff --git a/src/main/groovy/org/labkey/gradle/plugin/NpmRun.groovy b/src/main/groovy/org/labkey/gradle/plugin/NpmRun.groovy index f5b23932..8c454c2b 100644 --- a/src/main/groovy/org/labkey/gradle/plugin/NpmRun.groovy +++ b/src/main/groovy/org/labkey/gradle/plugin/NpmRun.groovy @@ -120,7 +120,6 @@ class NpmRun implements Plugin task.mustRunAfter "npmInstall" } - configureBuildTask(project.tasks.named('npmRunBuildProd')) configureBuildTask(project.tasks.named("npm_run_${project.npmRun.buildProd}")) def npmRunBuild = project.tasks.register("npmRunBuild") @@ -136,7 +135,6 @@ class NpmRun implements Plugin }) } - configureBuildTask(project.tasks.named('npmRunBuild')) configureBuildTask(project.tasks.named("npm_run_${project.npmRun.buildDev}")) if (BuildUtils.useServerNode(project) && project.path !== BuildUtils.getServerProject(project).path) { project.tasks.named('npmSetup').configure From 6252d65cd4d68db19bf939c0a7633fb070613ef7 Mon Sep 17 00:00:00 2001 From: labkey-susanh Date: Wed, 2 Jul 2025 17:27:20 -0700 Subject: [PATCH 2/4] gradle 8.14.2 --- gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index cea7a793..ff23a68d 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index f5feea6d..f3b75f3b 100755 --- a/gradlew +++ b/gradlew @@ -86,8 +86,7 @@ done # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) -APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s -' "$PWD" ) || exit +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum From 8c91fb5c1f362072d28338006c56cec60c9a4a8b Mon Sep 17 00:00:00 2001 From: labkey-susanh Date: Wed, 2 Jul 2025 17:47:07 -0700 Subject: [PATCH 3/4] Remove customizations no longer needed that are incompatible with the configuration cache --- .../groovy/org/labkey/gradle/plugin/NpmRun.groovy | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/src/main/groovy/org/labkey/gradle/plugin/NpmRun.groovy b/src/main/groovy/org/labkey/gradle/plugin/NpmRun.groovy index 8c454c2b..70d12891 100644 --- a/src/main/groovy/org/labkey/gradle/plugin/NpmRun.groovy +++ b/src/main/groovy/org/labkey/gradle/plugin/NpmRun.groovy @@ -128,11 +128,6 @@ class NpmRun implements Plugin task.description ="Runs 'npm run ${project.npmRun.buildDev}'" task.dependsOn "npm_run_${project.npmRun.buildDev}" task.mustRunAfter "npmInstall" - task.doFirst({ - task.logger.info("npmWorkDir ${project.node.npmWorkDir.get()}") - task.logger.info("workDir ${project.node.workDir.get()}") - task.logger.info("resolvedNodeDir ${project.node.resolvedNodeDir.get()}") - }) } configureBuildTask(project.tasks.named("npm_run_${project.npmRun.buildDev}")) @@ -146,15 +141,8 @@ class NpmRun implements Plugin project.tasks.named('npmInstall').configure {Task task -> - task.inputs.file project.file(NPM_PROJECT_FILE) - if (project.file(NPM_PROJECT_LOCK_FILE).exists()) - task.inputs.file project.file(NPM_PROJECT_LOCK_FILE) // Specify legacy peer dependency mode for npm v7+ task.args = ["--legacy-peer-deps"] - task.outputs.upToDateWhen { project.file(NODE_MODULES_DIR).exists() } - if (BuildUtils.useServerNode(project)) { - task.dependsOn(BuildUtils.getServerProject(project).tasks.npmSetup) - } } def runCommand = LabKeyExtension.isDevMode(project) && !project.hasProperty('useNpmProd') ? npmRunBuild : npmRunBuildProd From 49218e964aa6ac12aa7af57d42ffdde7a3530a74 Mon Sep 17 00:00:00 2001 From: labkey-susanh Date: Thu, 3 Jul 2025 12:20:59 -0700 Subject: [PATCH 4/4] release date and version --- README.md | 5 +++-- build.gradle | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 6f70e8af..61f71d84 100644 --- a/README.md +++ b/README.md @@ -13,10 +13,11 @@ on how to do that, including how to develop and test locally and the versioning ## Release Notes -### 6.3.0-SNAPSHOT -*Released*: TBD +### 6.3.0 +*Released*: 3 July 2025 (Earliest compatible LabKey version: 25.2) - Issue 53067: Update `npmRunBuild` and `npmRunBuildProd` tasks to not declare outputs as they duplicate the wrapped tasks causing caching to be disabled +- Remove extra configurations for `npmInstall` that are no longer required and not compatible with configuration cache ### 6.2.0 *Released*: 23 April, 2025 diff --git a/build.gradle b/build.gradle index c25d0e0d..7a6302cc 100644 --- a/build.gradle +++ b/build.gradle @@ -42,7 +42,7 @@ dependencies { } group = 'org.labkey.build' -project.version = "6.3.0-npmBuild-SNAPSHOT" +project.version = "6.4.0-SNAPSHOT" gradlePlugin { plugins {