(maven-gh-actions-shared) branch mvn4 updated (6e27c04 -> fb7a129)

[sj...@apache.org]

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

sjaranowski pushed a change to branch mvn4
in repository https://gitbox.apache.org/repos/asf/maven-gh-actions-shared.git


 discard 6e27c04  Add support for Maven 4
     new fb7a129  Add support for Maven 4

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (6e27c04)
            \
             N -- N -- N   refs/heads/mvn4 (fb7a129)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 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/maven-verify.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(maven-gh-actions-shared) 01/01: Add support for Maven 4

[sj...@apache.org]

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

sjaranowski pushed a commit to branch mvn4
in repository https://gitbox.apache.org/repos/asf/maven-gh-actions-shared.git

commit fb7a129913b80b9c4ea74cdba03ba791f8d5ad6c
Author: Slawomir Jaranowski <s....@gmail.com>
AuthorDate: Sat Jun 1 16:40:27 2024 +0200

    Add support for Maven 4
---
 .github/workflows/maven-verify-test.yml |  7 +++++
 .github/workflows/maven-verify.yml      | 53 ++++++++++++++++++++++++++++++---
 2 files changed, 56 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/maven-verify-test.yml b/.github/workflows/maven-verify-test.yml
index 3cd11dd..c28a794 100644
--- a/.github/workflows/maven-verify-test.yml
+++ b/.github/workflows/maven-verify-test.yml
@@ -36,3 +36,10 @@ jobs:
       verify-goal: clean install
       verify-fail-fast: false
       maven-matrix: '[ "3.9.6", "3.8.8", "3.6.3" ]'
+
+  verify-3:
+    name: Verify 3
+    uses: ./.github/workflows/maven-verify.yml
+    needs: verify-2
+    with:
+      maven4-enabled: true
diff --git a/.github/workflows/maven-verify.yml b/.github/workflows/maven-verify.yml
index b8a2cca..91331a7 100644
--- a/.github/workflows/maven-verify.yml
+++ b/.github/workflows/maven-verify.yml
@@ -50,6 +50,18 @@ on:
         default: '[ "3.6.3", "3.9.7" ]'
         type: string
 
+      maven4-verison:
+        description: The Maven 4.x version matrix
+        required: false
+        default: '4.0.0-beta-3'
+        type: string
+
+      maven4-enabled:
+        description: Determinate if use Maven 4 in build matrix
+        required: false
+        default: false
+        type: boolean
+
       matrix-include:
         description: include for matrix as json
         required: false
@@ -227,12 +239,45 @@ jobs:
       - name: Clean Ensuring no file handle remains open on windows
         run: ./mvnw clean --errors --batch-mode --show-version
 
-  verify:
+  setup-matrix:
+    runs-on: "ubuntu-latest"
     needs: fail-fast-build
+    if: always() && ( !inputs.ff-run || needs.fail-fast-build.result == 'success' )
+    outputs:
+      maven: ${{ steps.maven.outputs.matrix }}
+      exclude: ${{ steps.exclude.outputs.matrix }}
+
+    steps:
+      - id: maven
+        run: |
+          {
+            echo "matrix<<EOF"
+            if [ "${{ inputs.maven4-enabled }}" = "true" ]; then
+              echo "${{ inputs.maven-matrix }}" | jq -c '. + ["${{ inputs.maven4-verison }}"]'
+            else
+              echo "${{ inputs.maven-matrix }}"            
+            fi
+            echo "EOF"
+          } >> "$GITHUB_OUTPUT"
+
+      - id: exclude
+        run: |
+          {
+            echo "matrix<<EOF"
+            if [ "${{ inputs.maven4-enabled }}" = "true" ]; then
+              echo "${{ inputs.matrix-exclude }}" | jq -c '. + [{"jdk": "8", "maven": "${{ inputs.maven4-verison }}"}]'
+            else
+              echo "${{ inputs.matrix-exclude }}"            
+            fi
+            echo "EOF"
+          } >> "$GITHUB_OUTPUT"
+
+
+  verify:
+    needs: setup-matrix
     name: ${{ matrix.os }} jdk-${{ matrix.jdk }}-${{ matrix.distribution }} ${{ matrix.maven }}
     timeout-minutes: ${{ inputs.timeout-minutes }}
     runs-on: ${{ matrix.os }}
-    if: always() && ( !inputs.ff-run || needs.fail-fast-build.result == 'success' )
 
     strategy:
       fail-fast: ${{ inputs.verify-fail-fast }}
@@ -240,9 +285,9 @@ jobs:
         os: ${{ fromJSON( inputs.os-matrix ) }}
         jdk: ${{ fromJSON( inputs.jdk-matrix ) }}
         distribution: ${{ fromJSON( inputs.jdk-distribution-matrix ) }}
-        maven: ${{ fromJSON( inputs.maven-matrix ) }}
+        maven: ${{ fromJSON( needs.setup-matrix.maven ) }}
         include: ${{ fromJSON( inputs.matrix-include ) }}
-        exclude: ${{ fromJSON( inputs.matrix-exclude ) }}
+        exclude: ${{ fromJSON( needs.setup-matrix.exclude ) }}
       max-parallel: ${{ inputs.max-parallel }}
 
     steps: