Skip to content

Commit 1f2bd43

Browse files
build(java): Introduce Native Image testing build script changes (#1485)
1 parent 7f0fe4d commit 1f2bd43

File tree

7 files changed

+76
-15
lines changed

7 files changed

+76
-15
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:
2-
digest: sha256:db1616f2f70823d8381d859835229e04371d14f59ac78063c5af73c55c3fffbb
32
image: gcr.io/repo-automation-bots/owlbot-java:latest
3+
digest: sha256:d4b2141d65566523dfd523f63c6e6899ab1281463bce182a9f600e74b0511875

.github/blunderbuss.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Configuration for the Blunderbuss GitHub app. For more info see
2-
# https://github.com/googleapis/repo-automation-bots/tree/master/packages/blunderbuss
2+
# https://github.com/googleapis/repo-automation-bots/tree/main/packages/blunderbuss
33
assign_prs_by:
44
- labels:
55
- samples

.github/workflows/ci.yaml

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,23 @@
11
on:
22
push:
33
branches:
4-
- master
4+
- main
55
pull_request:
66
name: ci
77
jobs:
88
units:
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
@@ -28,7 +28,28 @@ source ${scriptDir}/common.sh
2828
java -version
2929
echo $JOB_TYPE
3030

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

3354
# this should run maven enforcer
3455
retry_with_backoff 3 10 \

.kokoro/presubmit/graalvm-native.cfg

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+
}

renovate.json

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,5 @@
7070
}
7171
],
7272
"semanticCommits": true,
73-
"dependencyDashboard": true,
74-
"dependencyDashboardLabels": [
75-
"type: process"
76-
]
73+
"dependencyDashboard": true
7774
}

0 commit comments

Comments
 (0)