Skip to content

Issue 53067: remove unnecessary output declarations that interfere with caching #232

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
labkey-susanh merged 4 commits into from
Jul 3, 2025
Merged

Issue 53067: remove unnecessary output declarations that interfere with caching #232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3f89f09
Issue 53067: Update `npmRunBuild` and `npmRunBuildProd` tasks to not …
labkey-susanh Jul 2, 2025
6252d65
gradle 8.14.2
labkey-susanh Jul 3, 2025
8c91fb5
Remove customizations no longer needed that are incompatible with the…
labkey-susanh Jul 3, 2025
49218e9
release date and version
labkey-susanh Jul 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +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
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ dependencies {
}

group = 'org.labkey.build'
project.version = "6.3.0-SNAPSHOT"
project.version = "6.4.0-SNAPSHOT"

gradlePlugin {
plugins {
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 1 addition & 2 deletions gradlew
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 0 additions & 14 deletions src/main/groovy/org/labkey/gradle/plugin/NpmRun.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,6 @@ class NpmRun implements Plugin<Project>
task.mustRunAfter "npmInstall"

}
configureBuildTask(project.tasks.named('npmRunBuildProd'))
configureBuildTask(project.tasks.named("npm_run_${project.npmRun.buildProd}"))

def npmRunBuild = project.tasks.register("npmRunBuild")
Expand All @@ -129,14 +128,8 @@ class NpmRun implements Plugin<Project>
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('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
Expand All @@ -148,15 +141,8 @@ class NpmRun implements Plugin<Project>

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
Expand Down