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 2020/08/19 12:48:38 UTC
[jmeter] branch master updated (445df9f -> ceddfe7)
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 445df9f Fix to: Implement a new setting to allow the exclusion of embedded URLs
new 0b13f13 Update Gradle to 6.6
new ceddfe7 Configure Gradle local build cache, add build scans, and use gradle-cache-action for GitHub CI
The 2 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:
.github/workflows/main.yml | 19 ++++++++++++-------
build.gradle.kts | 5 +++++
buildSrc/checksum.xml | 3 +++
gradle.properties | 4 ++++
gradle/wrapper/gradle-wrapper.jar | Bin 58694 -> 59203 bytes
gradle/wrapper/gradle-wrapper.properties | 4 ++--
gradlew | 2 ++
gradlew.bat | 22 ++++------------------
settings.gradle.kts | 20 +++++++++++++++++++-
9 files changed, 51 insertions(+), 28 deletions(-)
[jmeter] 01/02: Update Gradle to 6.6
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 0b13f13a9be4ba909ff21a83263336414ac206ba
Author: Vladimir Sitnikov <si...@gmail.com>
AuthorDate: Wed Aug 19 14:40:39 2020 +0300
Update Gradle to 6.6
---
buildSrc/checksum.xml | 3 +++
gradle/wrapper/gradle-wrapper.jar | Bin 58694 -> 59203 bytes
gradle/wrapper/gradle-wrapper.properties | 4 ++--
gradlew | 2 ++
gradlew.bat | 22 ++++------------------
5 files changed, 11 insertions(+), 20 deletions(-)
diff --git a/buildSrc/checksum.xml b/buildSrc/checksum.xml
index df0e465..d2f817f 100644
--- a/buildSrc/checksum.xml
+++ b/buildSrc/checksum.xml
@@ -54,6 +54,9 @@
<dependency group='org.gradle.kotlin' module='plugins' version='1.3.4'>
<sha512>B6F05B16B1826C3FD50D80AFD14965566B27313691A111EC8589867678D6B92AF827E5E098BECCE8F911D8B479AF5303322A6B2ECA971D1A2D985F42BD1AAA87</sha512>
</dependency>
+ <dependency group='org.gradle.kotlin' module='plugins' version='1.3.6'>
+ <sha512>FFC641492549525D06D6788A3D708C7108AFA06C35796EF0B3A71541672162A7BAFDE6DC8F90F63D524BA33D1447C172C589491C16CF3B91C2C3E150AAB71B46</sha512>
+ </dependency>
<dependency group='org.slf4j' module='jcl-over-slf4j' version='1.6.2'>
<sha512>3BA508C96EE0985865C9E86EBE803D1903835F7C198EB15723CDC86B028D6C82DBB7E96ECB01CEFAD7CC6EC7023155676D034B6B730A911D0FFE9F91FE532592</sha512>
</dependency>
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 490fda8..e708b1c 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 2ae6d63..0194212 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -17,7 +17,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionSha256Sum=0f316a67b971b7b571dac7215dcf2591a30994b3450e0629925ffcfe2c68cc5c
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-all.zip
+distributionSha256Sum=e6f83508f0970452f56197f610d13c5f593baaf43c0e3c6a571e5967be754025
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.6-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 2fe81a7..4f906e0 100755
--- a/gradlew
+++ b/gradlew
@@ -82,6 +82,7 @@ esac
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
# Determine the Java command to use to start the JVM.
if [ -n "$JAVA_HOME" ] ; then
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -129,6 +130,7 @@ fi
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
JAVACMD=`cygpath --unix "$JAVACMD"`
# We build the pattern for arguments to be converted via cygpath
diff --git a/gradlew.bat b/gradlew.bat
index 62bd9b9..107acd3 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute
echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -54,7 +54,7 @@ goto fail
set JAVA_HOME=%JAVA_HOME:"=%
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -64,28 +64,14 @@ echo location of your Java installation.
goto fail
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
:execute
@rem Setup the command line
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
:end
@rem End local scope for the variables with windows NT shell
[jmeter] 02/02: Configure Gradle local build cache, add build scans,
and use gradle-cache-action for GitHub CI
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 ceddfe7adb288aa221089727b457ec7243d9d326
Author: Vladimir Sitnikov <si...@gmail.com>
AuthorDate: Wed Aug 19 13:26:41 2020 +0300
Configure Gradle local build cache, add build scans, and use gradle-cache-action for GitHub CI
This commit configures local build cache, and it delegates
Gradle execution to burrunan/gradle-cache-action.
It unlocks fine-grained remote build cache with GitHub Actions backend
(=faster builds), and it adds error markers
(e.g. compilation errors right in the commit diffs)
See https://github.com/burrunan/gradle-cache-action#gradle-cache-action
---
.github/workflows/main.yml | 19 ++++++++++++-------
build.gradle.kts | 5 +++++
gradle.properties | 4 ++++
settings.gradle.kts | 20 +++++++++++++++++++-
4 files changed, 40 insertions(+), 8 deletions(-)
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index be85ffc..83c7f53 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -22,10 +22,12 @@ jobs:
uses: actions/setup-java@v1
with:
java-version: 14
- - name: 'Test'
- shell: bash
- run: |
- ./gradlew --no-parallel build -x distTar -x distTarSource
+ - uses: burrunan/gradle-cache-action@v1
+ name: Test
+ with:
+ job-id: jdk14
+ multi-cache-enabled: false
+ arguments: --scan --no-parallel build -x distTar -x distTarSource
mac:
name: 'macOS (JDK 14)'
@@ -38,6 +40,9 @@ jobs:
uses: actions/setup-java@v1
with:
java-version: 14
- - name: 'Test'
- run: |
- ./gradlew --no-parallel build -x distTar -x distTarSource -Dskip.test_TestDNSCacheManager.testWithCustomResolverAnd1Server=true
+ - uses: burrunan/gradle-cache-action@v1
+ name: Test
+ with:
+ job-id: jdk14
+ multi-cache-enabled: false
+ arguments: --scan --no-parallel build -x distTar -x distTarSource -Dskip.test_TestDNSCacheManager.testWithCustomResolverAnd1Server=true
diff --git a/build.gradle.kts b/build.gradle.kts
index 4f0c605..3f40ffd 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -506,6 +506,11 @@ allprojects {
exceptionFormat = TestExceptionFormat.FULL
showStandardStreams = true
}
+
+ outputs.cacheIf("test outcomes sometimes depends on third-party systems, so we should not cache it for now") {
+ false
+ }
+
// Pass the property to tests
fun passProperty(name: String, default: String? = null) {
val value = System.getProperty(name) ?: default
diff --git a/gradle.properties b/gradle.properties
index 1ce1c6c..862fcdd 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -16,6 +16,10 @@
#
org.gradle.parallel=true
+# Build cache can be disabled with --no-build-cache option
+org.gradle.caching=true
+#org.gradle.caching.debug=true
+
# See https://github.com/gradle/gradle/pull/11358 , https://issues.apache.org/jira/browse/INFRA-14923
# repository.apache.org does not yet support .sha256 and .sha512 checksums
systemProp.org.gradle.internal.publish.checksums.insecure=true
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 77f8f5b..2e178c0 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -32,6 +32,10 @@ pluginManagement {
}
}
+plugins {
+ `gradle-enterprise`
+}
+
// This is the name of a current project
// Note: it cannot be inferred from the directory name as developer might clone JMeter to jmeter_tmp folder
rootProject.name = "jmeter"
@@ -92,6 +96,18 @@ if (property("localReleasePlugins").toBool(nullAs = false, blankAs = true, defau
includeBuild("../vlsi-release-plugins")
}
+val isCiServer = System.getenv().containsKey("CI")
+
+if (isCiServer) {
+ gradleEnterprise {
+ buildScan {
+ termsOfServiceUrl = "https://gradle.com/terms-of-service"
+ termsOfServiceAgree = "yes"
+ tag("CI")
+ }
+ }
+}
+
// Checksum plugin sources can be validated at https://github.com/vlsi/vlsi-release-plugins
buildscript {
dependencies {
@@ -107,6 +123,8 @@ buildscript {
// Note: we need to verify the checksum for checksum-dependency-plugin itself
val expectedSha512 = mapOf(
+ "F7040C571C2A2727F2EED4EA772F5A7C5D9CB393828B7A2331F7167E467429486F5F3E9423883FE9A6D652FFB0484EAE722CDFB46D97180209BCBEEBF9C25DE3"
+ to "gradle-enterprise-gradle-plugin-3.4.jar",
"43BC9061DFDECA0C421EDF4A76E380413920E788EF01751C81BDC004BD28761FBD4A3F23EA9146ECEDF10C0F85B7BE9A857E9D489A95476525565152E0314B5B"
to "bcpg-jdk15on-1.62.jar",
"2BA6A5DEC9C8DAC2EB427A65815EB3A9ADAF4D42D476B136F37CD57E6D013BF4E9140394ABEEA81E42FBDB8FC59228C7B85C549ED294123BF898A7D048B3BD95"
@@ -137,7 +155,7 @@ val violations =
.joinToString("\n ") { (file, sha512) -> "SHA-512(${file.name}) = $sha512 ($file)" }
if (violations.isNotBlank()) {
- throw GradleException("Buildscript classpath has permitted files that were not explicitly permitted:\n $violations")
+ throw GradleException("Buildscript classpath has files that were not explicitly permitted:\n $violations")
}
apply(plugin = "com.github.vlsi.checksum-dependency")