diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index 47a70ea40cf..258389d1aa6 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -13,5 +13,5 @@ # limitations under the License. docker: image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest - digest: sha256:32851debfefed2b66038e0141f1b5c2103bb59ba80b7475adbc10ef7abab3de7 -# created: 2023-06-22T15:06:52.039318836Z + digest: sha256:31c8276a1bfb43766597d32645721c029cb94571f1b8d996cb2c290744fe52f9 +# created: 2023-06-27T18:51:58.922150125Z diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 7c5a0181129..44801b1f9f5 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -30,7 +30,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-java@v3 with: - distribution: zulu + distribution: temurin java-version: ${{matrix.java}} - run: java -version - run: .kokoro/build.sh @@ -45,13 +45,13 @@ jobs: - uses: actions/setup-java@v3 with: java-version: 8 - distribution: zulu + distribution: temurin - run: echo "SUREFIRE_JVM_OPT=-Djvm=${JAVA_HOME}/bin/java" >> $GITHUB_ENV shell: bash - uses: actions/setup-java@v3 with: java-version: 17 - distribution: zulu + distribution: temurin - run: .kokoro/build.sh env: JOB_TYPE: test @@ -62,13 +62,13 @@ jobs: - uses: actions/setup-java@v3 with: java-version: 8 - distribution: zulu + distribution: temurin - run: echo "JAVA8_HOME=${JAVA_HOME}" >> $GITHUB_ENV shell: bash - uses: actions/setup-java@v3 with: java-version: 11 - distribution: zulu + distribution: temurin - run: echo "JAVA11_HOME=${JAVA_HOME}" >> $GITHUB_ENV shell: bash - run: java -version @@ -84,17 +84,29 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-java@v3 with: - distribution: zulu + distribution: temurin java-version: ${{matrix.java}} - run: java -version - run: .kokoro/dependencies.sh + javadoc: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - uses: actions/setup-java@v3 + with: + distribution: temurin + java-version: 17 + - run: java -version + - run: .kokoro/build.sh + env: + JOB_TYPE: javadoc lint: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - uses: actions/setup-java@v3 with: - distribution: zulu + distribution: temurin java-version: 17 - run: java -version - run: .kokoro/build.sh @@ -106,7 +118,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-java@v3 with: - distribution: zulu + distribution: temurin java-version: 17 - run: java -version - run: .kokoro/build.sh diff --git a/.github/workflows/integration-tests-against-emulator.yaml b/.github/workflows/integration-tests-against-emulator.yaml index 71fbdc4bbf4..c7918cdd0f7 100644 --- a/.github/workflows/integration-tests-against-emulator.yaml +++ b/.github/workflows/integration-tests-against-emulator.yaml @@ -24,13 +24,13 @@ jobs: - uses: actions/setup-java@v3 with: java-version: 11 - distribution: zulu + distribution: temurin - name: Compiling main library run: .kokoro/build.sh - uses: actions/setup-java@v3 with: java-version: 8 - distribution: zulu + distribution: temurin - name: Running tests run: | mvn -V -B -Dspanner.testenv.instance="" -Penable-integration-tests \ diff --git a/.github/workflows/samples.yaml b/.github/workflows/samples.yaml index 8bc427d1eee..5bfeb995425 100644 --- a/.github/workflows/samples.yaml +++ b/.github/workflows/samples.yaml @@ -21,13 +21,13 @@ jobs: with: # Java 11 to generate class file targeting Java 8 java-version: 11 - distribution: zulu + distribution: temurin - name: Compile Spanner run: mvn clean install -Dclirr.skip=true - uses: actions/setup-java@v3 with: java-version: 8 - distribution: zulu + distribution: temurin - name: Compile samples run: mvn compile working-directory: samples @@ -42,7 +42,7 @@ jobs: - uses: actions/setup-java@v3 with: java-version: ${{matrix.java}} - distribution: zulu + distribution: temurin - name: Compile Spanner run: mvn clean install -Dclirr.skip=true - name: Compile samples