This is an automated email from the ASF dual-hosted git repository.
asolimando pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/calcite.git
The following commit(s) were added to refs/heads/main by this push:
new 11a3d74c1f [CALCITE-6511] Migrate from Gradle Enterprise Gradle Plugin
to Develocity Gradle Plugin
11a3d74c1f is described below
commit 11a3d74c1f0ec944aeea6b03883f078a05f38b95
Author: Clay Johnson <[email protected]>
AuthorDate: Wed Jul 31 12:54:07 2024 -0500
[CALCITE-6511] Migrate from Gradle Enterprise Gradle Plugin to Develocity
Gradle Plugin
---
.github/workflows/buildcache.yml | 2 +-
.github/workflows/main.yml | 32 ++++++++++++++++----------------
gradle.properties | 4 ++--
settings.gradle.kts | 17 ++++++-----------
4 files changed, 25 insertions(+), 30 deletions(-)
diff --git a/.github/workflows/buildcache.yml b/.github/workflows/buildcache.yml
index 419588304f..739651d75b 100644
--- a/.github/workflows/buildcache.yml
+++ b/.github/workflows/buildcache.yml
@@ -52,7 +52,7 @@ jobs:
env:
S3_BUILD_CACHE_ACCESS_KEY_ID: ${{
secrets.S3_BUILD_CACHE_ACCESS_KEY_ID }}
S3_BUILD_CACHE_SECRET_KEY: ${{ secrets.S3_BUILD_CACHE_SECRET_KEY }}
- GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
+ DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
with:
job-id: jdk${{ matrix.jdk }}
remote-build-cache-proxy-enabled: false
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index c380a56c4e..47edd911e4 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -65,7 +65,7 @@ jobs:
env:
S3_BUILD_CACHE_ACCESS_KEY_ID: ${{ secrets.S3_BUILD_CACHE_ACCESS_KEY_ID
}}
S3_BUILD_CACHE_SECRET_KEY: ${{ secrets.S3_BUILD_CACHE_SECRET_KEY }}
- GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
+ DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
with:
job-id: jdk${{ matrix.jdk }}
remote-build-cache-proxy-enabled: false
@@ -99,7 +99,7 @@ jobs:
env:
S3_BUILD_CACHE_ACCESS_KEY_ID: ${{
secrets.S3_BUILD_CACHE_ACCESS_KEY_ID }}
S3_BUILD_CACHE_SECRET_KEY: ${{ secrets.S3_BUILD_CACHE_SECRET_KEY }}
- GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
+ DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
with:
job-id: jdk${{ matrix.jdk }}
remote-build-cache-proxy-enabled: false
@@ -133,7 +133,7 @@ jobs:
env:
S3_BUILD_CACHE_ACCESS_KEY_ID: ${{
secrets.S3_BUILD_CACHE_ACCESS_KEY_ID }}
S3_BUILD_CACHE_SECRET_KEY: ${{ secrets.S3_BUILD_CACHE_SECRET_KEY }}
- GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
+ DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
with:
job-id: jdk${{ matrix.jdk }}
remote-build-cache-proxy-enabled: false
@@ -170,7 +170,7 @@ jobs:
env:
S3_BUILD_CACHE_ACCESS_KEY_ID: ${{
secrets.S3_BUILD_CACHE_ACCESS_KEY_ID }}
S3_BUILD_CACHE_SECRET_KEY: ${{ secrets.S3_BUILD_CACHE_SECRET_KEY }}
- GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
+ DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
with:
job-id: jdk${{ matrix.jdk }}
remote-build-cache-proxy-enabled: false
@@ -222,7 +222,7 @@ jobs:
env:
S3_BUILD_CACHE_ACCESS_KEY_ID: ${{
secrets.S3_BUILD_CACHE_ACCESS_KEY_ID }}
S3_BUILD_CACHE_SECRET_KEY: ${{ secrets.S3_BUILD_CACHE_SECRET_KEY }}
- GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
+ DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
with:
job-id: jdk${{ matrix.jdk }}
remote-build-cache-proxy-enabled: false
@@ -248,7 +248,7 @@ jobs:
env:
S3_BUILD_CACHE_ACCESS_KEY_ID: ${{
secrets.S3_BUILD_CACHE_ACCESS_KEY_ID }}
S3_BUILD_CACHE_SECRET_KEY: ${{ secrets.S3_BUILD_CACHE_SECRET_KEY }}
- GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
+ DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
with:
job-id: jdk${{ matrix.jdk }}
remote-build-cache-proxy-enabled: false
@@ -274,7 +274,7 @@ jobs:
env:
S3_BUILD_CACHE_ACCESS_KEY_ID: ${{
secrets.S3_BUILD_CACHE_ACCESS_KEY_ID }}
S3_BUILD_CACHE_SECRET_KEY: ${{ secrets.S3_BUILD_CACHE_SECRET_KEY }}
- GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
+ DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
with:
job-id: jdk${{ matrix.jdk }}
remote-build-cache-proxy-enabled: false
@@ -300,7 +300,7 @@ jobs:
env:
S3_BUILD_CACHE_ACCESS_KEY_ID: ${{
secrets.S3_BUILD_CACHE_ACCESS_KEY_ID }}
S3_BUILD_CACHE_SECRET_KEY: ${{ secrets.S3_BUILD_CACHE_SECRET_KEY }}
- GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
+ DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
with:
job-id: jdk${{ matrix.jdk }}
remote-build-cache-proxy-enabled: false
@@ -324,7 +324,7 @@ jobs:
env:
S3_BUILD_CACHE_ACCESS_KEY_ID: ${{ secrets.S3_BUILD_CACHE_ACCESS_KEY_ID
}}
S3_BUILD_CACHE_SECRET_KEY: ${{ secrets.S3_BUILD_CACHE_SECRET_KEY }}
- GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
+ DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
with:
job-id: avatica-jdk${{ matrix.jdk }}
remote-build-cache-proxy-enabled: false
@@ -341,7 +341,7 @@ jobs:
env:
S3_BUILD_CACHE_ACCESS_KEY_ID: ${{ secrets.S3_BUILD_CACHE_ACCESS_KEY_ID
}}
S3_BUILD_CACHE_SECRET_KEY: ${{ secrets.S3_BUILD_CACHE_SECRET_KEY }}
- GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
+ DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
with:
job-id: jdk${{ matrix.jdk }}
remote-build-cache-proxy-enabled: false
@@ -369,7 +369,7 @@ jobs:
env:
S3_BUILD_CACHE_ACCESS_KEY_ID: ${{
secrets.S3_BUILD_CACHE_ACCESS_KEY_ID }}
S3_BUILD_CACHE_SECRET_KEY: ${{ secrets.S3_BUILD_CACHE_SECRET_KEY }}
- GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
+ DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
with:
job-id: jdk21
remote-build-cache-proxy-enabled: false
@@ -404,7 +404,7 @@ jobs:
env:
S3_BUILD_CACHE_ACCESS_KEY_ID: ${{
secrets.S3_BUILD_CACHE_ACCESS_KEY_ID }}
S3_BUILD_CACHE_SECRET_KEY: ${{ secrets.S3_BUILD_CACHE_SECRET_KEY }}
- GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
+ DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
with:
job-id: errprone
remote-build-cache-proxy-enabled: false
@@ -427,7 +427,7 @@ jobs:
env:
S3_BUILD_CACHE_ACCESS_KEY_ID: ${{
secrets.S3_BUILD_CACHE_ACCESS_KEY_ID }}
S3_BUILD_CACHE_SECRET_KEY: ${{ secrets.S3_BUILD_CACHE_SECRET_KEY }}
- GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
+ DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
with:
job-id: checkerframework-jdk11
remote-build-cache-proxy-enabled: false
@@ -452,7 +452,7 @@ jobs:
env:
S3_BUILD_CACHE_ACCESS_KEY_ID: ${{
secrets.S3_BUILD_CACHE_ACCESS_KEY_ID }}
S3_BUILD_CACHE_SECRET_KEY: ${{ secrets.S3_BUILD_CACHE_SECRET_KEY }}
- GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
+ DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
with:
job-id: checkerframework-jdk11
remote-build-cache-proxy-enabled: false
@@ -478,7 +478,7 @@ jobs:
env:
S3_BUILD_CACHE_ACCESS_KEY_ID: ${{
secrets.S3_BUILD_CACHE_ACCESS_KEY_ID }}
S3_BUILD_CACHE_SECRET_KEY: ${{ secrets.S3_BUILD_CACHE_SECRET_KEY }}
- GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
+ DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
with:
job-id: jdk8
remote-build-cache-proxy-enabled: false
@@ -525,7 +525,7 @@ jobs:
env:
S3_BUILD_CACHE_ACCESS_KEY_ID: ${{ secrets.S3_BUILD_CACHE_ACCESS_KEY_ID
}}
S3_BUILD_CACHE_SECRET_KEY: ${{ secrets.S3_BUILD_CACHE_SECRET_KEY }}
- GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
+ DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
with:
build-root-directory: ./calcite
job-id: Druid8
diff --git a/gradle.properties b/gradle.properties
index ca8ca2d824..4643aa37db 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -59,8 +59,8 @@ org.jetbrains.gradle.plugin.idea-ext.version=0.5
org.nosphere.apache.rat.version=0.8.1
org.owasp.dependencycheck.version=6.1.6
org.sonarqube.version=3.5.0.2730
-com.gradle.enterprise.version=3.13.2
-com.gradle.common-custom-user-data-gradle-plugin.version=1.10
+com.gradle.develocity.version=3.17.6
+com.gradle.common-custom-user-data-gradle-plugin.version=2.0.2
# For now, we use Kotlin for tests only, so we don't want to include
kotlin-stdlib dependency to the runtimeClasspath
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 9033080d1d..1039856ac9 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -14,14 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-import
com.gradle.enterprise.gradleplugin.internal.extension.BuildScanExtensionWithHiddenFeatures
-
pluginManagement {
plugins {
fun String.v() = extra["$this.version"].toString()
fun PluginDependenciesSpec.idv(id: String, key: String = id) = id(id)
version key.v()
- idv("com.gradle.enterprise")
+ idv("com.gradle.develocity")
idv("com.gradle.common-custom-user-data-gradle-plugin")
idv("com.autonomousapps.dependency-analysis")
idv("org.checkerframework")
@@ -55,7 +53,7 @@ pluginManagement {
}
plugins {
- id("com.gradle.enterprise")
+ id("com.gradle.develocity")
id("com.gradle.common-custom-user-data-gradle-plugin")
id("com.github.burrunan.s3-build-cache")
}
@@ -106,16 +104,13 @@ fun property(name: String) =
val isCiServer = System.getenv().containsKey("CI")
-gradleEnterprise {
+develocity {
server = "https://ge.apache.org";
- allowUntrustedServer = false
+ projectId = "calcite"
buildScan {
- capture { isTaskInputFiles = true }
- isUploadInBackground = !isCiServer
- publishAlways()
- this as BuildScanExtensionWithHiddenFeatures
- publishIfAuthenticated()
+ uploadInBackground = !isCiServer
+ publishing.onlyIf { it.isAuthenticated() }
obfuscation {
ipAddresses { addresses -> addresses.map { "0.0.0.0" } }
}
