ci: emulator test also uses JDK 11

googleapis · May 25, 2022 · 9d5220e · 9d5220e
1 parent ba8334b
commit 9d5220e
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 3 deletions.
diff --git a/.github/workflows/integration-tests-against-emulator.yaml b/.github/workflows/integration-tests-against-emulator.yaml
@@ -20,12 +20,27 @@ jobs:
     - uses: stCarolas/setup-maven@v4
       with:
         maven-version: 3.8.1
-    - uses: actions/setup-java@v1
+    # Build with JDK 11 and run tests with JDK 8
+    - uses: actions/setup-java@v3
+      with:
+        java-version: 11
+        distribution: zulu
+    - run: echo "JAVA11_HOME=${JAVA_HOME}" >> $GITHUB_ENV
+      shell: bash
+    - uses: actions/setup-java@v3
       with:
         java-version: 8
+        distribution: zulu
+    - run: echo "JAVA8_HOME=${JAVA_HOME}" >> $GITHUB_ENV
+      shell: bash
     - run: java -version
-    - run: .kokoro/build.sh
-    - run: mvn -B -Dspanner.testenv.instance="" -Penable-integration-tests -DtrimStackTrace=false -Dclirr.skip=true -Denforcer.skip=true -fae verify
+    - name: Compiling main library
+      run: .kokoro/build.sh
+    - name: Running tests
+      run: |
+        mvn -B -Dspanner.testenv.instance="" -Penable-integration-tests \
+            -DtrimStackTrace=false -Dclirr.skip=true -Denforcer.skip=true\
+            -Dmaven.main.skip=true -fae verify
       env:
         JOB_TYPE: test
         SPANNER_EMULATOR_HOST: localhost:9010

diff --git a/.kokoro/build.sh b/.kokoro/build.sh
@@ -95,6 +95,7 @@ slowtests)
     -DtrimStackTrace=false \
     -Dclirr.skip=true \
     -Denforcer.skip=true \
+    -Dmaven.main.skip=true \
     -fae \
     verify
   RETURN_CODE=$?