chore: add test coverage for Java 21

GoogleCloudPlatform · Aug 25, 2023 · 8b1fd01 · 8b1fd01
1 parent f3fe2ce
commit 8b1fd01
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 7 deletions.
diff --git a/.github/workflows/buildpack-integration-test.yml b/.github/workflows/buildpack-integration-test.yml
@@ -35,4 +35,4 @@ jobs:
       prerun: 'invoker/conformance/prerun.sh'
       builder-runtime: 'java17'
       builder-runtime-version: '17'
-      builder-url: gcr.io/gae-runtimes/buildpacks/google-gae-22/java/builder:latest
+      builder-url: gcr.io/gae-runtimes/buildpacks/google-gae-22/java/builder:latest
diff --git a/.github/workflows/conformance.yaml b/.github/workflows/conformance.yaml
@@ -14,9 +14,7 @@ jobs:
     strategy:
       matrix:
         java: [
-          11.x
-          # 12.x,
-          # 13.x
+          11.x,
         ]
     steps:
     - name: Harden Runner

diff --git a/.github/workflows/unit.yaml b/.github/workflows/unit.yaml
@@ -14,20 +14,21 @@ jobs:
       matrix:
         java: [
           11.x,
-          17.x
+          17.x,
+          21-ea
         ]
     steps:
     - name: Harden Runner
       uses: step-security/harden-runner@128a63446a954579617e875aaab7d2978154e969 # v2.4.0
       with:
         disable-sudo: true
-        egress-policy: block
+        egress-policy: audit
         allowed-endpoints: >
           github.com:443
           repo.maven.apache.org:443
     - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
     - name: Set up JDK ${{ matrix.java }}
-      uses: actions/setup-java@5ffc13f4174014e2d4d4572b3d74c3fa61aeb2c2 # v3.11.0
+      uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 # v3.12.0
       with:
         java-version: ${{ matrix.java }}
         distribution: temurin

diff --git a/invoker/core/src/test/java/com/google/cloud/functions/invoker/IntegrationTest.java b/invoker/core/src/test/java/com/google/cloud/functions/invoker/IntegrationTest.java
@@ -363,6 +363,10 @@ private static int getJavaVersion() {
       if (dot != -1) {
         version = version.substring(0, dot);
       }
+      int dash = version.indexOf("-");
+      if (dash != -1) {
+        version = version.substring(0, dash);
+      }
     }
     return Integer.parseInt(version);
   }
-Original file line number
+Diff line change
@@ Expand Up / @@ -14,9 +14,7 @@ jobs: @@
         strategy:
           matrix:
             java: [
-.x
-              # 12.x,
-              # 13.x
+.x,
             ]
         steps:
         - name: Harden Runner
@@ Expand Down @@