Skip to content

Commit 08dff74

Browse files
committed
chore(java-datastore): migrate java-datastore into monorepo
2 parents 7c2af43 + 048073b commit 08dff74

457 files changed

Lines changed: 180044 additions & 173 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Lines changed: 147 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,147 @@
1+
# Copyright 2022 Google LLC
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
# Github action job to test core java library features on
15+
# downstream client libraries before they are released.
16+
on:
17+
push:
18+
branches:
19+
- main
20+
pull_request:
21+
name: java-datastore ci
22+
env:
23+
BUILD_SUBDIR: java-datastore
24+
jobs:
25+
filter:
26+
runs-on: ubuntu-latest
27+
outputs:
28+
library: ${{ steps.filter.outputs.library }}
29+
steps:
30+
- uses: actions/checkout@v4
31+
- uses: dorny/paths-filter@v3
32+
id: filter
33+
with:
34+
filters: |
35+
library:
36+
- 'java-datastore/**'
37+
units:
38+
needs: filter
39+
if: ${{ needs.filter.outputs.library == 'true' }}
40+
runs-on: ubuntu-latest
41+
strategy:
42+
fail-fast: false
43+
matrix:
44+
java: [11, 17, 21, 25]
45+
steps:
46+
- uses: actions/checkout@v4
47+
- uses: actions/setup-java@v4
48+
with:
49+
distribution: temurin
50+
java-version: ${{matrix.java}}
51+
- run: java -version
52+
- run: .kokoro/build.sh
53+
env:
54+
JOB_TYPE: test
55+
units-java8:
56+
needs: filter
57+
if: ${{ needs.filter.outputs.library == 'true' }}
58+
# Building using Java 17 and run the tests with Java 8 runtime
59+
name: "units (8)"
60+
runs-on: ubuntu-latest
61+
steps:
62+
- uses: actions/checkout@v4
63+
- uses: actions/setup-java@v4
64+
with:
65+
java-version: 8
66+
distribution: temurin
67+
- name: "Set jvm system property environment variable for surefire plugin (unit tests)"
68+
# Maven surefire plugin (unit tests) allows us to specify JVM to run the tests.
69+
# https://maven.apache.org/surefire/maven-surefire-plugin/test-mojo.html#jvm
70+
run: echo "SUREFIRE_JVM_OPT=-Djvm=${JAVA_HOME}/bin/java -P !java17" >> $GITHUB_ENV
71+
shell: bash
72+
- uses: actions/setup-java@v4
73+
with:
74+
java-version: 17
75+
distribution: temurin
76+
- run: .kokoro/build.sh
77+
env:
78+
JOB_TYPE: test
79+
windows:
80+
needs: filter
81+
if: ${{ needs.filter.outputs.library == 'true' }}
82+
# Building using Java 11 and run the tests with Java 8 runtime
83+
runs-on: windows-latest
84+
steps:
85+
- name: Support longpaths
86+
run: git config --system core.longpaths true
87+
- name: Support longpaths
88+
run: git config --system core.longpaths true
89+
- uses: actions/checkout@v4
90+
- uses: actions/setup-java@v4
91+
with:
92+
java-version: 8
93+
distribution: temurin
94+
- name: "Set jvm system property environment variable for surefire plugin (unit tests)"
95+
run: echo "SUREFIRE_JVM_OPT=-Djvm=${JAVA_HOME}\bin\java -P !java17" >> $GITHUB_ENV
96+
shell: bash
97+
- uses: actions/setup-java@v4
98+
with:
99+
distribution: temurin
100+
java-version: 11
101+
- run: java -version
102+
- run: .kokoro/build.sh
103+
env:
104+
JOB_TYPE: test
105+
dependencies:
106+
needs: filter
107+
if: ${{ needs.filter.outputs.library == 'true' }}
108+
runs-on: ubuntu-latest
109+
strategy:
110+
matrix:
111+
java: [17]
112+
steps:
113+
- uses: actions/checkout@v4
114+
- uses: actions/setup-java@v4
115+
with:
116+
distribution: temurin
117+
java-version: ${{matrix.java}}
118+
- run: java -version
119+
- run: .kokoro/dependencies.sh
120+
javadoc:
121+
needs: filter
122+
if: ${{ needs.filter.outputs.library == 'true' }}
123+
runs-on: ubuntu-latest
124+
steps:
125+
- uses: actions/checkout@v4
126+
- uses: actions/setup-java@v4
127+
with:
128+
distribution: temurin
129+
java-version: 17
130+
- run: java -version
131+
- run: .kokoro/build.sh
132+
env:
133+
JOB_TYPE: javadoc
134+
lint:
135+
needs: filter
136+
if: ${{ needs.filter.outputs.library == 'true' }}
137+
runs-on: ubuntu-latest
138+
steps:
139+
- uses: actions/checkout@v4
140+
- uses: actions/setup-java@v4
141+
with:
142+
distribution: temurin
143+
java-version: 17
144+
- run: java -version
145+
- run: .kokoro/build.sh
146+
env:
147+
JOB_TYPE: lint

.kokoro/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ case ${JOB_TYPE} in
110110
-Djacoco.skip=true \
111111
-DskipUnitTests=true \
112112
-Dmaven.wagon.http.retryHandler.count=5 \
113-
-T 1C ${SUREFIRE_JVM_OPT}
113+
${SUREFIRE_JVM_OPT}
114114

115115
RETURN_CODE=$?
116116
popd

.kokoro/common.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ excluded_modules=(
1919
'google-cloud-pom-parent'
2020
'java-vertexai'
2121
'java-logging'
22+
'java-datastore'
2223
)
2324

2425
function retry_with_backoff {
@@ -203,7 +204,7 @@ function generate_modified_modules_list() {
203204
if [[ -n $modules ]]; then
204205
modules=$(echo "${modules}" | cut -d '/' -f1 | sort -u)
205206
for module in $modules; do
206-
if [[ ! " ${excluded_modules[*]} " =~ " ${module} " && " ${maven_modules[*]} " =~ " ${module} " ]]; then
207+
if [[ " ${maven_modules[*]} " =~ " ${module} " ]]; then
207208
modified_module_list+=("${module}")
208209
fi
209210
done
Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
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-public-resources/graalvm_sdk_platform_a:3.56.0" # {x-version-update:google-cloud-shared-dependencies:current}
7+
}
8+
9+
env_vars: {
10+
key: "JOB_TYPE"
11+
value: "graalvm-single"
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+
}
34+
35+
env_vars: {
36+
key: "IT_SERVICE_ACCOUNT_EMAIL"
37+
value: "it-service-account@gcloud-devel.iam.gserviceaccount.com"
38+
}
39+
env_vars: {
40+
key: "BUILD_SUBDIR"
41+
value: "java-datastore"
42+
}
43+
44+
env_vars: {
45+
key: "DATASTORE_PROJECT_ID"
46+
value: "gcloud-devel"
47+
}
Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
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/java8"
7+
}
8+
9+
env_vars: {
10+
key: "JOB_TYPE"
11+
value: "integration-single"
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: "DATASTORE_PROJECT_ID"
27+
value: "gcloud-devel"
28+
}
29+
30+
env_vars: {
31+
key: "GOOGLE_APPLICATION_CREDENTIALS"
32+
value: "secret_manager/java-it-service-account"
33+
}
34+
35+
env_vars: {
36+
key: "SECRET_MANAGER_KEYS"
37+
value: "java-it-service-account"
38+
}
39+
env_vars: {
40+
key: "BUILD_SUBDIR"
41+
value: "java-datastore"
42+
}
43+
44+
env_vars: {
45+
key: "DATASTORE_PROJECT_ID"
46+
value: "gcloud-devel"
47+
}

generation/check_non_release_please_versions.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ for pomFile in $(find . -mindepth 2 -name pom.xml | sort ); do
88
[[ "${pomFile}" =~ .*google-cloud-pom-parent.* ]] || \
99
[[ "${pomFile}" =~ .*CoverageAggregator.* ]] || \
1010
[[ "${pomFile}" =~ .*java-shared-dependencies*. ]] || \
11+
[[ "${pomFile}" =~ .*java-datastore.* ]] || \
1112
[[ "${pomFile}" =~ .*.github*. ]]; then
1213
continue
1314
fi

0 commit comments

Comments
 (0)