Skip to content

Commit

Permalink
ci: javadoc job (JDK 17) in ci.yaml (#1819) (#2515)
Browse files Browse the repository at this point in the history
* ci: javadoc job (JDK 17) in ci.yaml (#1819)

This also changes the JDK distribution from zulu to temurin
https://github.com/actions/setup-java#eclipse-temurin
Source-Link: googleapis/synthtool@ef9fe2e
Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-java:latest@sha256:31c8276a1bfb43766597d32645721c029cb94571f1b8d996cb2c290744fe52f9

* temurin

* 🦉 Updates from OwlBot post-processor

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

---------

Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
Co-authored-by: Tomo Suzuki <[email protected]>
  • Loading branch information
3 people authored Jul 21, 2023
1 parent c54faf9 commit b14ee87
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 15 deletions.
4 changes: 2 additions & 2 deletions .github/.OwlBot.lock.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
28 changes: 20 additions & 8 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/integration-tests-against-emulator.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/samples.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down

0 comments on commit b14ee87

Please sign in to comment.