Consolidate CI/CD (#137)

* Consolidate CI/CD * Minor CI/CD correction
coherence-community · Oct 2, 2024 · 0ce964f · 0ce964f
1 parent 07acf6e
commit 0ce964f
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 152 deletions.
diff --git a/.github/workflows/maven-build-jdk21.yml b/.github/workflows/maven-build-jdk21.yml
diff --git a/.github/workflows/maven-build-snapshots-14110.yml b/.github/workflows/maven-build-snapshots-14110.yml
diff --git a/.github/workflows/maven-build-snapshots.yml b/.github/workflows/maven-build-snapshots.yml
@@ -19,15 +19,17 @@ jobs:
       matrix:
         coherenceVersion:
           - 24.09
+        javaVersion:
+          - 21
+          - 22
 
     steps:
     - uses: actions/checkout@v4
 
-
-    - name: Set up JDK 21
+    - name: Set up JDK ${{ matrix.javaVersion }}
       uses: actions/setup-java@v4
       with:
-        java-version: '21'
+        java-version: '${{ matrix.javaVersion }}'
         distribution: 'zulu'
 
     - name: Print Versions

diff --git a/.github/workflows/maven-build.yml b/.github/workflows/maven-build.yml
@@ -18,8 +18,8 @@ jobs:
       fail-fast: false
       matrix:
         version:
-          - 14.1.1-0-17
-          - 22.06.8
+          - 14.1.1-0-18
+          - 22.06.9
 
     steps:
     - name: Checkout

diff --git a/.github/workflows/polyglot-build-jdk21.yml b/.github/workflows/polyglot-build-jdk21.yml
@@ -12,15 +12,19 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
+      matrix:
+        javaVersion:
+          - 21
+          - 22
 
     steps:
     - name: Checkout
       uses: actions/checkout@v4
 
-    - name: Set up JDK 21
+    - name: Set up JDK ${{ matrix.javaVersion }}
       uses: actions/setup-java@v4
       with:
-        java-version: '21'
+        java-version: '${{ matrix.javaVersion }}'
         distribution: 'zulu'
 
     - name: Print Versions
@@ -36,7 +40,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v5
       with:
-        go-version: '1.20'
+        go-version: '1.23'
 
     - name: Set up Python 3.11
       uses: actions/setup-python@v5