Update to setup-java v2, and use adopt builds

https://github.com/actions/setup-java/blob/main/docs/switching-to-v2.md PiperOrigin-RevId: 384750269
google · Jul 14, 2021 · 687c27a · 687c27a
1 parent a997afa
commit 687c27a
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -47,9 +47,10 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-maven-
       - name: 'Set up JDK ${{ matrix.java }}'
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v2
         with:
           java-version: ${{ matrix.java }}
+          distribution: 'adopt'
       - name: 'Install'
         shell: bash
         run: mvn install -DskipTests=true -Dmaven.javadoc.skip=true -B -V
@@ -76,9 +77,10 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-maven-
       - name: 'Set up JDK 8'
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v2
         with:
           java-version: 8
+          distribution: 'adopt'
           server-id: sonatype-nexus-snapshots
           server-username: CI_DEPLOY_USERNAME
           server-password: CI_DEPLOY_PASSWORD
@@ -104,9 +106,10 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-maven-
       - name: 'Set up JDK 15'
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v2
         with:
           java-version: 15
+          distribution: 'adopt'
       - name: 'Generate latest docs'
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}