Merge branch '2.18'

FasterXML · Apr 29, 2024 · 4165196 · 4165196
2 parents fc2490a + 65b1bb5
commit 4165196
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -18,12 +18,18 @@ on:
     - "release-notes/*"
 jobs:
   build:
-    runs-on: ${{ matrix.os }}
+    runs-on: 'ubuntu-20.04'
     strategy:
       fail-fast: false
       matrix:
         java_version: ['8', '11', '17', '21']
-        os: ['ubuntu-20.04']
+        guava_version: ['25.1-jre']
+        # Include additional permutations for JDK 8
+        include:
+          - java_version: '8'
+            guava_version: '20.0'
+          - java_version: '8'
+            guava_version: '33.1.0-jre'
     env:
       JAVA_OPTS: "-XX:+TieredCompilation -XX:TieredStopAtLevel=1"
     steps:
@@ -41,12 +47,16 @@ jobs:
         # gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} # Value of the GPG private key to import
         # gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase
     - name: Build
-      run: ./mvnw -B -q -ff -ntp verify
+      # Note: build separately first with default Guava
+      run: ./mvnw -B -q -ff -ntp clean package
+    - name: Test
+      # Note: actual testing to use matrix-version of Guava
+      run: ./mvnw -B -q -ff -ntp -Dversion.guava=${{ matrix.guava_version }} surefire:test
     - name: Extract project Maven version
       id: projectVersion
       run: echo ::set-output name=version::$(./mvnw org.apache.maven.plugins:maven-help-plugin:3.3.0:evaluate -DforceStdout -Dexpression=project.version -q)
     - name: Deploy snapshot
-      if: github.event_name != 'pull_request' && matrix.java_version == '8' && endsWith(steps.projectVersion.outputs.version, '-SNAPSHOT')
+      if: github.event_name != 'pull_request' && matrix.java_version == '8' && matrix.guava_version == '25.1-jre' && endsWith(steps.projectVersion.outputs.version, '-SNAPSHOT')
       env:
         CI_DEPLOY_USERNAME: ${{ secrets.CI_DEPLOY_USERNAME }}
         CI_DEPLOY_PASSWORD: ${{ secrets.CI_DEPLOY_PASSWORD }}

diff --git a/release-notes/VERSION-2.x b/release-notes/VERSION-2.x
@@ -22,6 +22,8 @@ Active Maintainers:
 
 2.17.1 (not yet released)
 
+#149: (guava) Update CI to use Matrix Build to test against different
+  Guava versions
 - HPPC dependency upgraded to 0.8.2 (from 0.8.1)
 
 2.17.0 (12-Mar-2024)