You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by vl...@apache.org on 2023/01/10 18:55:52 UTC
[jmeter] branch master updated (1113a183c5 -> 3013d59089)
This is an automated email from the ASF dual-hosted git repository.
vladimirsitnikov pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git
from 1113a183c5 bump actions/setup-java@v1 -> actions/setup-java@v2
new be226be9bd chore: add /src/dist-check/temp/ to .gitignore
new 4998611f45 Enabled build caching for some tasks
new 3013d59089 Use relative paths in task inputs
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.gitignore | 3 +++
src/dist/build.gradle.kts | 10 ++++++----
src/licenses/build.gradle.kts | 2 +-
3 files changed, 10 insertions(+), 5 deletions(-)
[jmeter] 02/03: Enabled build caching for some tasks
Posted by vl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
vladimirsitnikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git
commit 4998611f45fc9da2b1f6bbc3916e581649f4cba1
Author: Sandra Thieme <st...@gradle.com>
AuthorDate: Fri Jan 6 11:23:30 2023 +0100
Enabled build caching for some tasks
---
src/dist/build.gradle.kts | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/dist/build.gradle.kts b/src/dist/build.gradle.kts
index 9fc84783de..500fe45810 100644
--- a/src/dist/build.gradle.kts
+++ b/src/dist/build.gradle.kts
@@ -340,6 +340,7 @@ fun createAnakiaTask(
)
inputs.property("extension", extension)
outputs.dir(outputDir)
+ outputs.cacheIf { true }
dependsOn(prepareProps)
doLast {
@@ -442,6 +443,7 @@ val processSiteXslt by tasks.registering {
inputs.files(xdocs)
inputs.property("year", lastEditYear)
outputs.dir(outputDir)
+ outputs.cacheIf { true }
doLast {
for (f in (outputs as TaskOutputsInternal).previousOutputFiles) {
[jmeter] 01/03: chore: add /src/dist-check/temp/ to .gitignore
Posted by vl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
vladimirsitnikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git
commit be226be9bdce45128affb6e9f1cae4a7fbb0d695
Author: Vladimir Sitnikov <si...@gmail.com>
AuthorDate: Tue Jan 10 21:55:14 2023 +0300
chore: add /src/dist-check/temp/ to .gitignore
See https://github.com/apache/jmeter/issues/5762
---
.gitignore | 3 +++
1 file changed, 3 insertions(+)
diff --git a/.gitignore b/.gitignore
index 7f2b2e19a2..2400313e97 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,6 +14,9 @@
/src/protocol/*/build/
/src/protocol/*/bin/
/src/protocol/*/out/
+# This folder is generated by running one of the tests (HTML report?), so ignore it for now
+# See https://github.com/apache/jmeter/issues/5762
+/src/dist-check/temp/
/dist/
/docs/
/local/
[jmeter] 03/03: Use relative paths in task inputs
Posted by vl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
vladimirsitnikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git
commit 3013d59089adba8a8a07a9f6429f4614661892a4
Author: Sandra Thieme <st...@gradle.com>
AuthorDate: Fri Jan 6 11:29:21 2023 +0100
Use relative paths in task inputs
This improves build caching because those paths are part of the cache
key calculation.
---
src/dist/build.gradle.kts | 8 ++++----
src/licenses/build.gradle.kts | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/dist/build.gradle.kts b/src/dist/build.gradle.kts
index 500fe45810..bd0e7f3518 100644
--- a/src/dist/build.gradle.kts
+++ b/src/dist/build.gradle.kts
@@ -330,14 +330,14 @@ fun createAnakiaTask(
}
return tasks.register(taskName) {
- inputs.file("$baseDir/$style")
- inputs.file("$baseDir/$projectFile")
+ inputs.file("$baseDir/$style").withPathSensitivity(PathSensitivity.RELATIVE).withPropertyName("styleDir")
+ inputs.file("$baseDir/$projectFile").withPathSensitivity(PathSensitivity.RELATIVE).withPropertyName("projectDir")
inputs.files(
fileTree(baseDir) {
include(*includes)
exclude(*excludes)
}
- )
+ ).withPathSensitivity(PathSensitivity.RELATIVE).withPropertyName("baseDir")
inputs.property("extension", extension)
outputs.dir(outputDir)
outputs.cacheIf { true }
@@ -440,7 +440,7 @@ fun xslt(
val processSiteXslt by tasks.registering {
val outputDir = "$buildDir/siteXslt"
- inputs.files(xdocs)
+ inputs.files(xdocs).withPathSensitivity(PathSensitivity.RELATIVE).withPropertyName("xdocs")
inputs.property("year", lastEditYear)
outputs.dir(outputDir)
outputs.cacheIf { true }
diff --git a/src/licenses/build.gradle.kts b/src/licenses/build.gradle.kts
index 05d5a27a88..07a1da3fe8 100644
--- a/src/licenses/build.gradle.kts
+++ b/src/licenses/build.gradle.kts
@@ -51,7 +51,7 @@ fun gradleWrapperVersion(wrapperProps: String) =
val gatherSourceLicenses by tasks.registering(GatherLicenseTask::class) {
val wrapperProps = "$rootDir/gradle/wrapper/gradle-wrapper.properties"
- inputs.file(wrapperProps)
+ inputs.file(wrapperProps).withPathSensitivity(PathSensitivity.RELATIVE).withPropertyName("wrapper.props")
addDependency("org.gradle:gradle-wrapper:${gradleWrapperVersion(wrapperProps)}", SpdxLicense.Apache_2_0)
addDependency(":bootstrap:3.3.4", SpdxLicense.MIT)
addDependency(":bootstrap-social:4.8.0", SpdxLicense.MIT)