You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by pk...@apache.org on 2024/07/19 12:36:07 UTC

(logging-parent) branch develocity updated (647d0ec -> 90243f3)

This is an automated email from the ASF dual-hosted git repository.

pkarwasz pushed a change to branch develocity
in repository https://gitbox.apache.org/repos/asf/logging-parent.git


    from 647d0ec  Inline Develocity version until `logging-parent` is published
     new d73f637  Improve Develocity Build Scan support with develocity-actions/maven-setup step
     new 6ad773d  Reset `MAVEN_OPTS` after build
     new 90243f3  pin maven-setup action

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:
 .github/workflows/build-reusable.yaml               | 20 ++++++++++++++------
 .github/workflows/codeql-analysis-reusable.yaml     |  6 ------
 .github/workflows/deploy-release-reusable.yaml      |  7 -------
 .github/workflows/deploy-site-reusable.yaml         |  6 ------
 .github/workflows/deploy-snapshot-reusable.yaml     |  4 ----
 .github/workflows/merge-dependabot-reusable.yaml    |  3 ---
 .github/workflows/scorecards-analysis-reusable.yaml |  4 ----
 7 files changed, 14 insertions(+), 36 deletions(-)


(logging-parent) 02/03: Reset `MAVEN_OPTS` after build

Posted by pk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

pkarwasz pushed a commit to branch develocity
in repository https://gitbox.apache.org/repos/asf/logging-parent.git

commit 6ad773d0d5cf26dc598559b07a6925b35a7479d4
Author: Piotr P. Karwasz <pi...@karwasz.org>
AuthorDate: Thu Jul 18 11:22:52 2024 +0200

    Reset `MAVEN_OPTS` after build
---
 .github/workflows/build-reusable.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/build-reusable.yaml b/.github/workflows/build-reusable.yaml
index bfba6c6..f58cf34 100644
--- a/.github/workflows/build-reusable.yaml
+++ b/.github/workflows/build-reusable.yaml
@@ -113,6 +113,7 @@ jobs:
         shell: bash
         run: |
           rm -f .mvn/extensions.xml
+          echo "MAVEN_OPTS=" >> "$GITHUB_ENV"
 
       # Node.js cache is needed for Antora
       - name: Set up Node.js cache


(logging-parent) 03/03: pin maven-setup action

Posted by pk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

pkarwasz pushed a commit to branch develocity
in repository https://gitbox.apache.org/repos/asf/logging-parent.git

commit 90243f3e61908adf85c7f870fa073ec2a42357ce
Author: Jerome Prinet <jp...@gradle.com>
AuthorDate: Fri Jul 19 14:27:31 2024 +0200

    pin maven-setup action
---
 .github/workflows/build-reusable.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build-reusable.yaml b/.github/workflows/build-reusable.yaml
index f58cf34..26d7a79 100644
--- a/.github/workflows/build-reusable.yaml
+++ b/.github/workflows/build-reusable.yaml
@@ -92,7 +92,7 @@ jobs:
 
       - name: Setup Develocity Build Scan capture
         if: inputs.develocity-enabled
-        uses: gradle/develocity-actions/maven-setup@v1
+        uses: gradle/develocity-actions/maven-setup@23b7c25d7e5e4a4dd5bc214d9adb43b837f8917d   # 1
         with:
           develocity-access-key: ${{ secrets.DV_ACCESS_TOKEN }}
 


(logging-parent) 01/03: Improve Develocity Build Scan support with develocity-actions/maven-setup step

Posted by pk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

pkarwasz pushed a commit to branch develocity
in repository https://gitbox.apache.org/repos/asf/logging-parent.git

commit d73f63728f95e33a2f4559625f43d7e5f111434e
Author: Jerome Prinet <jp...@gradle.com>
AuthorDate: Wed Jul 17 15:08:56 2024 +0200

    Improve Develocity Build Scan support with develocity-actions/maven-setup step
---
 .github/workflows/build-reusable.yaml               | 19 +++++++++++++------
 .github/workflows/codeql-analysis-reusable.yaml     |  6 ------
 .github/workflows/deploy-release-reusable.yaml      |  7 -------
 .github/workflows/deploy-site-reusable.yaml         |  6 ------
 .github/workflows/deploy-snapshot-reusable.yaml     |  4 ----
 .github/workflows/merge-dependabot-reusable.yaml    |  3 ---
 .github/workflows/scorecards-analysis-reusable.yaml |  4 ----
 7 files changed, 13 insertions(+), 36 deletions(-)

diff --git a/.github/workflows/build-reusable.yaml b/.github/workflows/build-reusable.yaml
index edb4ba3..bfba6c6 100644
--- a/.github/workflows/build-reusable.yaml
+++ b/.github/workflows/build-reusable.yaml
@@ -32,8 +32,12 @@ on:
         description: Runs a reproducibility check on the build
         default: true
         type: boolean
+      develocity-enabled:
+        description: Enable Develocity Build Scan publication
+        default: false
+        type: boolean
     secrets:
-      GE_ACCESS_TOKEN:
+      DV_ACCESS_TOKEN:
         description: Access token to Gradle Enterprise
         required: false
 
@@ -64,11 +68,10 @@ jobs:
           cache: maven
 
       - name: Set up Develocity
-        env:
-          HAS_TOKEN: ${{ secrets.GE_ACCESS_TOKEN != null }}
+        if: inputs.develocity-enabled
         shell: bash
         run: |
-          if [ -f .mvn/develocity.xml -a "$HAS_TOKEN" == "true" ]; then
+          if [ -f .mvn/develocity.xml ]; then
             # DEVELOCITY_VERSION=$(./mvnw help:evaluate -q -DforceStdout -Dexpression=develocity-maven-plugin.version)
             # USER_DATA_VERSION=$(./mvnw help:evaluate -q -DforceStdout -Dexpression=common-custom-user-data-maven-extension.version)
             cat >.mvn/extensions.xml <<EOF
@@ -87,13 +90,17 @@ jobs:
           EOF
           fi
 
+      - name: Setup Develocity Build Scan capture
+        if: inputs.develocity-enabled
+        uses: gradle/develocity-actions/maven-setup@v1
+        with:
+          develocity-access-key: ${{ secrets.DV_ACCESS_TOKEN }}
+
       # We could have used `verify`, but `clean install` is required while generating the build reproducibility report, which is performed in the next step.
       # For details, see: https://maven.apache.org/guides/mini/guide-reproducible-builds.html#how-to-test-my-maven-build-reproducibility
       - name: Build
         id: build
         shell: bash
-        env:
-          DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
         run: |
           ./mvnw \
             --show-version --batch-mode --errors --no-transfer-progress \
diff --git a/.github/workflows/codeql-analysis-reusable.yaml b/.github/workflows/codeql-analysis-reusable.yaml
index d60ab36..d9d287d 100644
--- a/.github/workflows/codeql-analysis-reusable.yaml
+++ b/.github/workflows/codeql-analysis-reusable.yaml
@@ -30,10 +30,6 @@ on:
         description:
         default: java
         type: string
-    secrets:
-      GE_ACCESS_TOKEN:
-        description: Access token to Gradle Enterprise
-        required: false
 
 jobs:
 
@@ -60,8 +56,6 @@ jobs:
 
       - name: Build with Maven
         shell: bash
-        env:
-          DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
         run: |
           ./mvnw \
           --show-version --batch-mode --errors --no-transfer-progress \
diff --git a/.github/workflows/deploy-release-reusable.yaml b/.github/workflows/deploy-release-reusable.yaml
index c3778b8..ae0d481 100644
--- a/.github/workflows/deploy-release-reusable.yaml
+++ b/.github/workflows/deploy-release-reusable.yaml
@@ -44,9 +44,6 @@ on:
       SVN_PASSWORD:
         description: Subversion password for uploading the release distribution
         required: true
-      GE_ACCESS_TOKEN:
-        description: Access token to Gradle Enterprise
-        required: false
 
 jobs:
   deploy:
@@ -142,7 +139,6 @@ jobs:
           NEXUS_PASSWORD: ${{ secrets.NEXUS_PASSWORD }}
           # `SIGN_KEY` is used by `sign-maven-plugin`
           SIGN_KEY: ${{ secrets.GPG_SECRET_KEY }}
-          DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
         run: |
           ./mvnw \
             --show-version --batch-mode --errors --no-transfer-progress \
@@ -175,7 +171,6 @@ jobs:
         env:
           # Making Node.js cache hit visible for debugging purposes
           NODEJS_CACHE_HIT: ${{ steps.nodejs-cache.outputs.cache-hit }}
-          DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
         run: |
           export TIMESTAMP=$(./mvnw \
             --non-recursive --quiet --batch-mode \
@@ -189,8 +184,6 @@ jobs:
 
       - name: Stage distribution attachments
         shell: bash
-        env:
-          DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
         run: |
           # Dump deployed artifacts to a local folder
           export ALT_DEPLOYMENT_REPO_FILEPATH="target/alt-deployment-repo"
diff --git a/.github/workflows/deploy-site-reusable.yaml b/.github/workflows/deploy-site-reusable.yaml
index fa1f78c..78cdfb1 100644
--- a/.github/workflows/deploy-site-reusable.yaml
+++ b/.github/workflows/deploy-site-reusable.yaml
@@ -44,9 +44,6 @@ on:
       GPG_SECRET_KEY:
         description: GPG secret key for signing commits
         required: true
-      GE_ACCESS_TOKEN:
-        description: Access token to Gradle Enterprise
-        required: false
 
 jobs:
 
@@ -70,8 +67,6 @@ jobs:
       - name: Build the project
         shell: bash
         if: inputs.install-required
-        env:
-          DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
         run: |
           ./mvnw \
             --show-version --batch-mode --errors --no-transfer-progress \
@@ -104,7 +99,6 @@ jobs:
         env:
           # Making Node.js cache hit visible for debugging purposes
           NODEJS_CACHE_HIT: ${{ steps.nodejs-cache.outputs.cache-hit }}
-          DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
         run: |
           ./mvnw \
             --show-version --batch-mode --errors --no-transfer-progress \
diff --git a/.github/workflows/deploy-snapshot-reusable.yaml b/.github/workflows/deploy-snapshot-reusable.yaml
index 29e4e89..10ebbde 100644
--- a/.github/workflows/deploy-snapshot-reusable.yaml
+++ b/.github/workflows/deploy-snapshot-reusable.yaml
@@ -31,9 +31,6 @@ on:
       NEXUS_PASSWORD:
         description: Nexus snapshot repository password for deploying artifacts
         required: true
-      GE_ACCESS_TOKEN:
-        description: Access token to Gradle Enterprise
-        required: false
 
 jobs:
   deploy:
@@ -69,7 +66,6 @@ jobs:
           # `NEXUS_USERNAME` and `NEXUS_PASSWORD` are used in `~/.m2/settings.xml` created by `setup-java` action
           NEXUS_USERNAME: ${{ secrets.NEXUS_USERNAME }}
           NEXUS_PASSWORD: ${{ secrets.NEXUS_PASSWORD }}
-          DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
         run: |
           ./mvnw \
             --show-version --batch-mode --errors --no-transfer-progress \
diff --git a/.github/workflows/merge-dependabot-reusable.yaml b/.github/workflows/merge-dependabot-reusable.yaml
index f6d293b..a6bb92a 100644
--- a/.github/workflows/merge-dependabot-reusable.yaml
+++ b/.github/workflows/merge-dependabot-reusable.yaml
@@ -28,9 +28,6 @@ on:
       GPG_SECRET_KEY:
         description: GPG secret key for signing commits
         required: true
-      GE_ACCESS_TOKEN:
-        description: Access token to Gradle Enterprise
-        required: false
 
 jobs:
 
diff --git a/.github/workflows/scorecards-analysis-reusable.yaml b/.github/workflows/scorecards-analysis-reusable.yaml
index 4deccfb..6268086 100644
--- a/.github/workflows/scorecards-analysis-reusable.yaml
+++ b/.github/workflows/scorecards-analysis-reusable.yaml
@@ -19,10 +19,6 @@ name: scorecards-analysis
 
 on:
   workflow_call:
-    secrets:
-      GE_ACCESS_TOKEN:
-        description: Access token to Gradle Enterprise
-        required: false
 
 jobs: