From c97d1a2d64abf5335a76c73e0125a2ab84c7e034 Mon Sep 17 00:00:00 2001 From: Eric Haag Date: Wed, 29 Nov 2023 12:08:15 -0600 Subject: [PATCH 1/2] Connect build to ge.spring.io. This change publishes a build scan to ge.spring.io for every local build from an authenticated Spring committer and for CI where appropriate access tokens are available. The build will not fail if publishing fails. This change also allows the build to benefit from local and remote build caching, providing faster builds for all contributors. Additionally, the project will have access to all features of Develocity such as: - Dashboards to view all historical build scans, along with performance trends over time - Build failure analytics for enhanced investigation and diagnosis of build failures - Test failure analytics to better understand trends and causes around slow, failing, and flaky tests --- .github/workflows/maven.yml | 2 ++ .gitignore | 1 + .mvn/extensions.xml | 8 ++++++++ README.adoc | 2 ++ docs/src/main/asciidoc/README.adoc | 2 ++ 5 files changed, 15 insertions(+) create mode 100644 .mvn/extensions.xml diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index efced2adef..b020bf454b 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -28,6 +28,8 @@ jobs: cache: 'maven' - name: Build with Maven run: ./mvnw clean install -B -U -P sonar + env: + DEVELOCITY_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }} - uses: codecov/codecov-action@v4 with: fail_ci_if_error: false diff --git a/.gitignore b/.gitignore index 0f77f4edf4..bfdebc93c5 100644 --- a/.gitignore +++ b/.gitignore @@ -35,3 +35,4 @@ _metrics.adoc _conventions.adoc /package.json package-lock.json +.mvn/.develocity diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml new file mode 100644 index 0000000000..1e3bb355f5 --- /dev/null +++ b/.mvn/extensions.xml @@ -0,0 +1,8 @@ + + + + io.spring.develocity.conventions + develocity-conventions-maven-extension + 0.0.19 + + diff --git a/README.adoc b/README.adoc index 2efa0bf4e1..9f721bf8eb 100644 --- a/README.adoc +++ b/README.adoc @@ -10,6 +10,8 @@ image::https://github.com/spring-cloud/spring-cloud-netflix/actions/workflows/ma image:https://codecov.io/gh/spring-cloud/spring-cloud-netflix/branch/main/graph/badge.svg["Codecov", link="https://app.codecov.io/gh/spring-cloud/spring-cloud-netflix/tree/main"] +image:https://img.shields.io/badge/Revved%20up%20by-Develocity-06A0CE?logo=Gradle&labelColor=02303A["Revved up by Develocity", link="https://ge.spring.io/scans?search.rootProjectNames=Spring Cloud Netflix"] + [[features]] == Features diff --git a/docs/src/main/asciidoc/README.adoc b/docs/src/main/asciidoc/README.adoc index 1cb7cb3c43..ef95c4c833 100644 --- a/docs/src/main/asciidoc/README.adoc +++ b/docs/src/main/asciidoc/README.adoc @@ -3,6 +3,8 @@ image::https://github.com/spring-cloud/spring-cloud-netflix/actions/workflows/ma image:https://codecov.io/gh/spring-cloud/spring-cloud-netflix/branch/main/graph/badge.svg["Codecov", link="https://app.codecov.io/gh/spring-cloud/spring-cloud-netflix/tree/main"] +image:https://img.shields.io/badge/Revved%20up%20by-Develocity-06A0CE?logo=Gradle&labelColor=02303A["Revved up by Develocity", link="https://ge.spring.io/scans?search.rootProjectNames=Spring Cloud Netflix"] + [[features]] == Features From e8e19672fd6a9b7b201bad05c52aa037219c2c3f Mon Sep 17 00:00:00 2001 From: Eric Haag Date: Wed, 29 Nov 2023 14:21:09 -0600 Subject: [PATCH 2/2] Add annotation processors for compiler avoidance. This is done to speed up builds by avoiding recompilation of all sources when making non-ABI changes. This also optimizes the Gradle Enterprise build caching infrastructure. --- pom.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pom.xml b/pom.xml index 675aa87ef0..abae172ab0 100644 --- a/pom.xml +++ b/pom.xml @@ -79,6 +79,19 @@ false + + org.apache.maven.plugins + maven-compiler-plugin + + + + org.springframework.boot + spring-boot-configuration-processor + ${spring-boot.version} + + + +