Skip to content

Commit 66878c3

Browse files
chore: fix owlbot.py filename typo (#1675)
* chore: fix owlbot.py filename typo * πŸ¦‰ Updates from OwlBot See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * chore: update owlbot image * πŸ¦‰ Updates from OwlBot See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * πŸ¦‰ Updates from OwlBot See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * chore: add dependencies.sh script for java17 check Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
1 parent 7f1cc7a commit 66878c3

File tree

7 files changed

+77
-13
lines changed

7 files changed

+77
-13
lines changed

β€Ž.github/.OwlBot.lock.yamlβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
docker:
22
image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest
3-
digest: sha256:b328758e5113c392d3eccad613c2b18097eaebcb4d8bf77fab0326a6cad90bc7
3+
digest: sha256:d4b2141d65566523dfd523f63c6e6899ab1281463bce182a9f600e74b0511875

β€Ž.github/workflows/ci.yamlβ€Ž

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,15 @@ jobs:
99
runs-on: ubuntu-latest
1010
strategy:
1111
matrix:
12-
java: [8, 11]
12+
java: [8, 11, 17]
1313
steps:
1414
- uses: actions/checkout@v2
1515
- uses: stCarolas/setup-maven@v4
1616
with:
1717
maven-version: 3.8.1
18-
- uses: actions/setup-java@v1
18+
- uses: actions/setup-java@v2
1919
with:
20+
distribution: zulu
2021
java-version: ${{matrix.java}}
2122
- run: java -version
2223
- run: .kokoro/build.sh
@@ -29,8 +30,9 @@ jobs:
2930
- uses: stCarolas/setup-maven@v4
3031
with:
3132
maven-version: 3.8.1
32-
- uses: actions/setup-java@v1
33+
- uses: actions/setup-java@v2
3334
with:
35+
distribution: zulu
3436
java-version: 8
3537
- run: java -version
3638
- run: .kokoro/build.bat
@@ -40,14 +42,15 @@ jobs:
4042
runs-on: ubuntu-latest
4143
strategy:
4244
matrix:
43-
java: [8, 11]
45+
java: [8, 11, 17]
4446
steps:
4547
- uses: actions/checkout@v2
4648
- uses: stCarolas/setup-maven@v4
4749
with:
4850
maven-version: 3.8.1
49-
- uses: actions/setup-java@v1
51+
- uses: actions/setup-java@v2
5052
with:
53+
distribution: zulu
5154
java-version: ${{matrix.java}}
5255
- run: java -version
5356
- run: .kokoro/dependencies.sh
@@ -58,8 +61,9 @@ jobs:
5861
- uses: stCarolas/setup-maven@v4
5962
with:
6063
maven-version: 3.8.1
61-
- uses: actions/setup-java@v1
64+
- uses: actions/setup-java@v2
6265
with:
66+
distribution: zulu
6367
java-version: 8
6468
- run: java -version
6569
- run: .kokoro/build.sh
@@ -72,8 +76,9 @@ jobs:
7276
- uses: stCarolas/setup-maven@v4
7377
with:
7478
maven-version: 3.8.1
75-
- uses: actions/setup-java@v1
79+
- uses: actions/setup-java@v2
7680
with:
81+
distribution: zulu
7782
java-version: 8
7883
- run: java -version
7984
- run: .kokoro/build.sh

β€Ž.kokoro/build.shβ€Ž

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,11 @@ integration)
6969
verify
7070
RETURN_CODE=$?
7171
;;
72+
graalvm)
73+
# Run Unit and Integration Tests with Native Image
74+
mvn test -Pnative -Penable-integration-tests
75+
RETURN_CODE=$?
76+
;;
7277
samples)
7378
SAMPLES_DIR=samples
7479
# only run ITs in snapshot/ on presubmit PRs. run ITs in all 3 samples/ subdirectories otherwise.

β€Ž.kokoro/dependencies.shβ€Ž

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,28 @@ source ${scriptDir}/common.sh
2727
java -version
2828
echo $JOB_TYPE
2929

30-
export MAVEN_OPTS="-Xmx1024m -XX:MaxPermSize=128m"
30+
function determineMavenOpts() {
31+
local javaVersion=$(
32+
# filter down to the version line, then pull out the version between quotes,
33+
# then trim the version number down to its minimal number (removing any
34+
# update or suffix number).
35+
java -version 2>&1 | grep "version" \
36+
| sed -E 's/^.*"(.*?)".*$/\1/g' \
37+
| sed -E 's/^(1\.[0-9]\.0).*$/\1/g'
38+
)
39+
40+
case $javaVersion in
41+
"17")
42+
# MaxPermSize is no longer supported as of jdk 17
43+
echo -n "-Xmx1024m"
44+
;;
45+
*)
46+
echo -n "-Xmx1024m -XX:MaxPermSize=128m"
47+
;;
48+
esac
49+
}
50+
51+
export MAVEN_OPTS=$(determineMavenOpts)
3152

3253
# this should run maven enforcer
3354
retry_with_backoff 3 10 \
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
# Format: //devtools/kokoro/config/proto/build.proto
2+
3+
# Configure the docker image for kokoro-trampoline.
4+
env_vars: {
5+
key: "TRAMPOLINE_IMAGE"
6+
value: "gcr.io/cloud-devrel-kokoro-resources/graalvm"
7+
}
8+
9+
env_vars: {
10+
key: "JOB_TYPE"
11+
value: "graalvm"
12+
}
13+
14+
# TODO: remove this after we've migrated all tests and scripts
15+
env_vars: {
16+
key: "GCLOUD_PROJECT"
17+
value: "gcloud-devel"
18+
}
19+
20+
env_vars: {
21+
key: "GOOGLE_CLOUD_PROJECT"
22+
value: "gcloud-devel"
23+
}
24+
25+
env_vars: {
26+
key: "GOOGLE_APPLICATION_CREDENTIALS"
27+
value: "secret_manager/java-it-service-account"
28+
}
29+
30+
env_vars: {
31+
key: "SECRET_MANAGER_KEYS"
32+
value: "java-it-service-account"
33+
}

β€ŽREADME.mdβ€Ž

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,28 +43,28 @@ If you are using Maven without BOM, add this to your dependencies:
4343
<dependency>
4444
<groupId>com.google.cloud</groupId>
4545
<artifactId>google-cloud-bigquery</artifactId>
46-
<version>2.1.7</version>
46+
<version>2.1.13</version>
4747
</dependency>
4848

4949
```
5050

5151
If you are using Gradle 5.x or later, add this to your dependencies
5252

5353
```Groovy
54-
implementation platform('com.google.cloud:libraries-bom:23.0.0')
54+
implementation platform('com.google.cloud:libraries-bom:23.1.0')
5555
5656
implementation 'com.google.cloud:google-cloud-bigquery'
5757
```
5858
If you are using Gradle without BOM, add this to your dependencies
5959

6060
```Groovy
61-
implementation 'com.google.cloud:google-cloud-bigquery:2.1.7'
61+
implementation 'com.google.cloud:google-cloud-bigquery:2.3.2'
6262
```
6363

6464
If you are using SBT, add this to your dependencies
6565

6666
```Scala
67-
libraryDependencies += "com.google.cloud" % "google-cloud-bigquery" % "2.1.7"
67+
libraryDependencies += "com.google.cloud" % "google-cloud-bigquery" % "2.3.2"
6868
```
6969

7070
## Authentication
File renamed without changes.

0 commit comments

Comments
Β (0)