Skip to content

ci: javadoc job (JDK 17) in ci.yaml (#1819) #2515

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,20 +50,20 @@ If you are using Maven without the BOM, add this to your dependencies:
If you are using Gradle 5.x or later, add this to your dependencies:

```Groovy
implementation platform('com.google.cloud:libraries-bom:26.17.0')
implementation platform('com.google.cloud:libraries-bom:26.19.0')

implementation 'com.google.cloud:google-cloud-spanner'
```
If you are using Gradle without BOM, add this to your dependencies:

```Groovy
implementation 'com.google.cloud:google-cloud-spanner:6.43.0'
implementation 'com.google.cloud:google-cloud-spanner:6.43.2'
```

If you are using SBT, add this to your dependencies:

```Scala
libraryDependencies += "com.google.cloud" % "google-cloud-spanner" % "6.43.0"
libraryDependencies += "com.google.cloud" % "google-cloud-spanner" % "6.43.2"
```
<!-- {x-version-update-end} -->

Expand Down Expand Up @@ -412,7 +412,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
[kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-spanner/java11.html
[stability-image]: https://img.shields.io/badge/stability-stable-green
[maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-spanner.svg
[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-spanner/6.43.0
[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-spanner/6.43.2
[authentication]: https://github.com/googleapis/google-cloud-java#authentication
[auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
[predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles
Expand Down