From c7194b86d23dd067f678d2275ac2aa88f9e20367 Mon Sep 17 00:00:00 2001 From: Eric Haag Date: Fri, 2 Aug 2024 12:59:41 -0500 Subject: [PATCH 1/4] Use DV_SOLUTIONS_ACCESS_KEY environment variables --- .../convention-develocity-gradle-plugin-verification.yml | 4 ++-- .../convention-develocity-maven-extension-verification.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/convention-develocity-gradle-plugin-verification.yml b/.github/workflows/convention-develocity-gradle-plugin-verification.yml index 0fbd25bb5..41160e30b 100644 --- a/.github/workflows/convention-develocity-gradle-plugin-verification.yml +++ b/.github/workflows/convention-develocity-gradle-plugin-verification.yml @@ -80,13 +80,13 @@ jobs: ./gradlew wrapper --gradle-version=${{ matrix.versions.version }} --no-scan ./gradlew wrapper --gradle-version=${{ matrix.versions.version }} --no-scan env: - DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_SOLUTIONS_ACCESS_TOKEN }} + DEVELOCITY_ACCESS_KEY: ${{ secrets.DV_SOLUTIONS_ACCESS_KEY }} - name: Verify example build id: build working-directory: convention-develocity-gradle-plugin/examples/gradle_${{ matrix.versions.sample }} run: ./gradlew build -Ddevelocity.url=https://ge.solutions-team.gradle.com env: - DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_SOLUTIONS_ACCESS_TOKEN }} + DEVELOCITY_ACCESS_KEY: ${{ secrets.DV_SOLUTIONS_ACCESS_KEY }} - name: Verify Build Scan published if: ${{ !steps.build.outputs.build-scan-url }} run: echo "::error ::No Build Scan published"; exit 1 diff --git a/.github/workflows/convention-develocity-maven-extension-verification.yml b/.github/workflows/convention-develocity-maven-extension-verification.yml index 36015c157..206474d62 100644 --- a/.github/workflows/convention-develocity-maven-extension-verification.yml +++ b/.github/workflows/convention-develocity-maven-extension-verification.yml @@ -64,9 +64,9 @@ jobs: working-directory: convention-develocity-maven-extension/examples/maven_${{ matrix.versions.sample }} run: ./mvnw wrapper:wrapper -Dmaven=${{ matrix.versions.version }} -Ddevelocity.url=https://ge.solutions-team.gradle.com env: - DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_SOLUTIONS_ACCESS_TOKEN }} + DEVELOCITY_ACCESS_KEY: ${{ secrets.DV_SOLUTIONS_ACCESS_KEY }} - name: Verify example build working-directory: convention-develocity-maven-extension/examples/maven_${{ matrix.versions.sample }} run: ./mvnw clean verify -Ddevelocity.url=https://ge.solutions-team.gradle.com env: - DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_SOLUTIONS_ACCESS_TOKEN }} + DEVELOCITY_ACCESS_KEY: ${{ secrets.DV_SOLUTIONS_ACCESS_KEY }} From 6d2d5fedd9b770f0662fa078f3fe2321e2d44242 Mon Sep 17 00:00:00 2001 From: Eric Haag Date: Fri, 2 Aug 2024 13:00:28 -0500 Subject: [PATCH 2/4] Do not publish a scan for Maven wrapper upgrade The Gradle wrapper upgrade already disables scans. --- .../convention-develocity-maven-extension-verification.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/convention-develocity-maven-extension-verification.yml b/.github/workflows/convention-develocity-maven-extension-verification.yml index 206474d62..6d390eb26 100644 --- a/.github/workflows/convention-develocity-maven-extension-verification.yml +++ b/.github/workflows/convention-develocity-maven-extension-verification.yml @@ -62,7 +62,7 @@ jobs: - name: Set Maven version if: ${{ matrix.versions.version != '(Current)' }} working-directory: convention-develocity-maven-extension/examples/maven_${{ matrix.versions.sample }} - run: ./mvnw wrapper:wrapper -Dmaven=${{ matrix.versions.version }} -Ddevelocity.url=https://ge.solutions-team.gradle.com + run: ./mvnw wrapper:wrapper -Dmaven=${{ matrix.versions.version }} -Ddevelocity.scan.disabled env: DEVELOCITY_ACCESS_KEY: ${{ secrets.DV_SOLUTIONS_ACCESS_KEY }} - name: Verify example build From 1bc6bba666e098efb2675519080c5ada6d228ad6 Mon Sep 17 00:00:00 2001 From: Eric Haag Date: Fri, 2 Aug 2024 13:02:48 -0500 Subject: [PATCH 3/4] Run workflows when workflow files are modified --- .../convention-develocity-gradle-plugin-verification.yml | 4 ++-- .../convention-develocity-maven-extension-verification.yml | 4 ++-- .../workflows/gradle-data-capturing-samples-verification.yml | 4 ++-- .../maven-build-caching-samples-verification.yml.disabled | 4 ++-- .../workflows/maven-data-capturing-samples-verification.yml | 4 ++-- .github/workflows/quarkus-build-caching-extension.yml | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/convention-develocity-gradle-plugin-verification.yml b/.github/workflows/convention-develocity-gradle-plugin-verification.yml index 41160e30b..d143fc5eb 100644 --- a/.github/workflows/convention-develocity-gradle-plugin-verification.yml +++ b/.github/workflows/convention-develocity-gradle-plugin-verification.yml @@ -3,10 +3,10 @@ name: Verify Convention Develocity Gradle Plugin on: push: branches: [ main ] - paths: [ 'convention-develocity-gradle-plugin/**' ] + paths: [ 'convention-develocity-gradle-plugin/**', '.github/workflows/**' ] pull_request: branches: [ main ] - paths: [ 'convention-develocity-gradle-plugin/**' ] + paths: [ 'convention-develocity-gradle-plugin/**', '.github/workflows/**' ] workflow_dispatch: jobs: diff --git a/.github/workflows/convention-develocity-maven-extension-verification.yml b/.github/workflows/convention-develocity-maven-extension-verification.yml index 6d390eb26..1e4458b34 100644 --- a/.github/workflows/convention-develocity-maven-extension-verification.yml +++ b/.github/workflows/convention-develocity-maven-extension-verification.yml @@ -3,10 +3,10 @@ name: Verify Convention Develocity Maven Extension on: push: branches: [ main ] - paths: [ 'convention-develocity-maven-extension/**' ] + paths: [ 'convention-develocity-maven-extension/**', '.github/workflows/**' ] pull_request: branches: [ main ] - paths: [ 'convention-develocity-maven-extension/**' ] + paths: [ 'convention-develocity-maven-extension/**', '.github/workflows/**' ] workflow_dispatch: jobs: diff --git a/.github/workflows/gradle-data-capturing-samples-verification.yml b/.github/workflows/gradle-data-capturing-samples-verification.yml index dea8711f6..0adf60f3a 100644 --- a/.github/workflows/gradle-data-capturing-samples-verification.yml +++ b/.github/workflows/gradle-data-capturing-samples-verification.yml @@ -3,10 +3,10 @@ name: Verify Gradle Data Capturing Samples on: push: branches: [ main ] - paths: [ 'build-data-capturing-gradle-samples/**' ] + paths: [ 'build-data-capturing-gradle-samples/**', '.github/workflows/**' ] pull_request: branches: [ main ] - paths: [ 'build-data-capturing-gradle-samples/**' ] + paths: [ 'build-data-capturing-gradle-samples/**', '.github/workflows/**' ] workflow_dispatch: jobs: diff --git a/.github/workflows/maven-build-caching-samples-verification.yml.disabled b/.github/workflows/maven-build-caching-samples-verification.yml.disabled index 03e59c882..0c4964414 100644 --- a/.github/workflows/maven-build-caching-samples-verification.yml.disabled +++ b/.github/workflows/maven-build-caching-samples-verification.yml.disabled @@ -3,10 +3,10 @@ name: Verify Maven Build Caching Samples on: push: branches: [ main ] - paths: [ 'build-caching-maven-samples/**' ] + paths: [ 'build-caching-maven-samples/**', '.github/workflows/**' ] pull_request: branches: [ main ] - paths: [ 'build-caching-maven-samples/**' ] + paths: [ 'build-caching-maven-samples/**', '.github/workflows/**' ] workflow_dispatch: jobs: diff --git a/.github/workflows/maven-data-capturing-samples-verification.yml b/.github/workflows/maven-data-capturing-samples-verification.yml index 3487be744..e2b3d554f 100644 --- a/.github/workflows/maven-data-capturing-samples-verification.yml +++ b/.github/workflows/maven-data-capturing-samples-verification.yml @@ -3,10 +3,10 @@ name: Verify Maven Data Capturing Samples on: push: branches: [ main ] - paths: [ 'build-data-capturing-maven-samples/**' ] + paths: [ 'build-data-capturing-maven-samples/**', '.github/workflows/**' ] pull_request: branches: [ main ] - paths: [ 'build-data-capturing-maven-samples/**' ] + paths: [ 'build-data-capturing-maven-samples/**', '.github/workflows/**' ] workflow_dispatch: jobs: diff --git a/.github/workflows/quarkus-build-caching-extension.yml b/.github/workflows/quarkus-build-caching-extension.yml index cefb6f1df..4e711d971 100644 --- a/.github/workflows/quarkus-build-caching-extension.yml +++ b/.github/workflows/quarkus-build-caching-extension.yml @@ -6,10 +6,10 @@ on: - cron: "0 9 * * 0" push: branches: [ main ] - paths: [ 'quarkus-build-caching-extension/**' ] + paths: [ 'quarkus-build-caching-extension/**', '.github/workflows/**' ] pull_request: branches: [ main ] - paths: [ 'quarkus-build-caching-extension/**' ] + paths: [ 'quarkus-build-caching-extension/**', '.github/workflows/**' ] workflow_dispatch: jobs: From 35a26466a56036b48234b3943b810440b7de56ac Mon Sep 17 00:00:00 2001 From: Eric Haag Date: Fri, 2 Aug 2024 13:06:23 -0500 Subject: [PATCH 4/4] Verify build scan published in Maven convention verification workflow --- .../convention-develocity-maven-extension-verification.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/convention-develocity-maven-extension-verification.yml b/.github/workflows/convention-develocity-maven-extension-verification.yml index 1e4458b34..4be93b8b6 100644 --- a/.github/workflows/convention-develocity-maven-extension-verification.yml +++ b/.github/workflows/convention-develocity-maven-extension-verification.yml @@ -54,6 +54,8 @@ jobs: java-version: '8' distribution: 'temurin' cache: maven + - name: Set up Maven + uses: gradle/develocity-actions/maven-setup@v1.1 - name: Download extension uses: actions/download-artifact@v4 with: @@ -66,7 +68,11 @@ jobs: env: DEVELOCITY_ACCESS_KEY: ${{ secrets.DV_SOLUTIONS_ACCESS_KEY }} - name: Verify example build + id: build working-directory: convention-develocity-maven-extension/examples/maven_${{ matrix.versions.sample }} run: ./mvnw clean verify -Ddevelocity.url=https://ge.solutions-team.gradle.com env: DEVELOCITY_ACCESS_KEY: ${{ secrets.DV_SOLUTIONS_ACCESS_KEY }} + - name: Verify Build Scan published + if: ${{ !steps.build.outputs.build-scan-url }} + run: echo "::error ::No Build Scan published"; exit 1