Skip to content

Commit e5996c4

Browse files
committed
Merge branch 'origin/main' into jdbc/otel-sdk-and-export-traces-impl
2 parents c4efa0f + fe608fe commit e5996c4

2,270 files changed

Lines changed: 1172190 additions & 403 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.

.github/CODEOWNERS

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,6 @@
1414
/google-auth-library-java/ @googleapis/cloud-sdk-auth-team @googleapis/cloud-sdk-java-team @googleapis/aion-team
1515
/java-storage/ @googleapis/gcs-team @googleapis/cloud-sdk-java-team
1616
/java-storage-nio/ @googleapis/gcs-team @googleapis/cloud-sdk-java-team
17+
/java-pubsub/ @googleapis/pubsub-team @googleapis/cloud-sdk-java-team
18+
/java-bigtable/ @googleapis/bigtable-team @googleapis/cloud-sdk-java-team
19+
/java-firestore/ @googleapis/firestore-team @googleapis/cloud-sdk-java-team

.github/workflows/ci.yaml

Lines changed: 26 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ jobs:
3636
with:
3737
filters: |
3838
src:
39-
- '!(java-bigquery|java-bigquerystorage|java-datastore|java-logging-logback|java-logging|java-spanner|java-storage|google-auth-library-java)/**/*.java'
40-
- '!(java-bigquery|java-bigquerystorage|java-datastore|java-logging-logback|java-logging|java-spanner|java-storage|google-auth-library-java)/**/pom.xml'
39+
- '!(google-auth-library-java|java-bigquery|java-bigquerystorage|java-bigtable|java-datastore|java-firestore|java-logging|java-logging-logback|java-pubsub|java-spanner|java-storage)/**/*.java'
40+
- '!(google-auth-library-java|java-bigquery|java-bigquerystorage|java-bigtable|java-datastore|java-firestore|java-logging|java-logging-logback|java-pubsub|java-spanner|java-storage)/**/pom.xml'
4141
- 'pom.xml'
4242
ci:
4343
- '.github/workflows/ci.yaml'
@@ -112,6 +112,7 @@ jobs:
112112
outputs:
113113
packages: ${{ steps.filter.outputs.changes }}
114114
steps:
115+
- uses: actions/checkout@v4
115116
- uses: dorny/paths-filter@fbd0ab8f3e69293af611ebaee6363fc25e6d187d # v4.0.1
116117
id: filter
117118
with:
@@ -171,6 +172,27 @@ jobs:
171172
- 'sdk-platform-java/**/*.java'
172173
- 'sdk-platform-java/java-shared-dependencies/**/pom.xml'
173174
- 'sdk-platform-java/gapic-generator-java-pom-parent/pom.xml'
175+
java-pubsub:
176+
- 'java-pubsub/**'
177+
- 'google-auth-library-java/**/*.java'
178+
- 'google-auth-library-java/**/pom.xml'
179+
- 'sdk-platform-java/**/*.java'
180+
- 'sdk-platform-java/java-shared-dependencies/**/pom.xml'
181+
- 'sdk-platform-java/gapic-generator-java-pom-parent/pom.xml'
182+
java-bigtable:
183+
- 'java-bigtable/**'
184+
- 'google-auth-library-java/**/*.java'
185+
- 'google-auth-library-java/**/pom.xml'
186+
- 'sdk-platform-java/**/*.java'
187+
- 'sdk-platform-java/java-shared-dependencies/**/pom.xml'
188+
- 'sdk-platform-java/gapic-generator-java-pom-parent/pom.xml'
189+
java-firestore:
190+
- 'java-firestore/**'
191+
- 'google-auth-library-java/**/*.java'
192+
- 'google-auth-library-java/**/pom.xml'
193+
- 'sdk-platform-java/**/*.java'
194+
- 'sdk-platform-java/java-shared-dependencies/**/pom.xml'
195+
- 'sdk-platform-java/gapic-generator-java-pom-parent/pom.xml'
174196
split-units:
175197
runs-on: ubuntu-latest
176198
needs: changes
@@ -317,8 +339,8 @@ jobs:
317339
- run: .kokoro/build.sh
318340
env:
319341
JOB_TYPE: lint
320-
HEAD_SHA: ${{ github.event.pull_request.head.sha }}
321-
BASE_SHA: ${{ github.event.pull_request.base.sha }}
342+
HEAD_SHA: ${{ github.event.pull_request.head.sha || github.sha }}
343+
BASE_SHA: ${{ github.event.pull_request.base.sha || github.event.before }}
322344
enforcer:
323345
runs-on: ubuntu-latest
324346
steps:

.github/workflows/create_additional_release_tag.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
- name: Create additional tags
2626
shell: bash
2727
run: |
28-
ARTIFACT_IDS=('google-cloud-shared-dependencies' 'api-common' 'gax')
28+
ARTIFACT_IDS=('google-cloud-shared-dependencies' 'api-common' 'gax' 'google-cloud-bigtable')
2929
for ARTIFACT_ID in "${ARTIFACT_IDS[@]}"; do
3030
VERSION=$(grep "^${ARTIFACT_ID}:" versions.txt | cut -d':' -f2 | tr -d '[:space:]')
3131
TAG_NAME="${ARTIFACT_ID}/v$VERSION"
Lines changed: 156 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,156 @@
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-bigtable ci
22+
env:
23+
BUILD_SUBDIR: java-bigtable
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-bigtable/**'
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: 11
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+
runs-on: windows-latest
83+
steps:
84+
- name: Support longpaths
85+
run: git config --system core.longpaths true
86+
- uses: actions/checkout@v4
87+
- uses: actions/setup-java@v4
88+
with:
89+
distribution: temurin
90+
java-version: 11
91+
- run: java -version
92+
- run: .kokoro/build.sh
93+
env:
94+
JOB_TYPE: test
95+
dependencies:
96+
needs: filter
97+
if: ${{ needs.filter.outputs.library == 'true' }}
98+
runs-on: ubuntu-latest
99+
strategy:
100+
matrix:
101+
java: [17]
102+
steps:
103+
- uses: actions/checkout@v4
104+
- uses: actions/setup-java@v4
105+
with:
106+
distribution: temurin
107+
java-version: ${{matrix.java}}
108+
- run: java -version
109+
- run: .kokoro/dependencies.sh
110+
javadoc:
111+
needs: filter
112+
if: ${{ needs.filter.outputs.library == 'true' }}
113+
runs-on: ubuntu-latest
114+
steps:
115+
- uses: actions/checkout@v4
116+
- uses: actions/setup-java@v4
117+
with:
118+
distribution: temurin
119+
java-version: 17
120+
- run: java -version
121+
- run: .kokoro/build.sh
122+
env:
123+
JOB_TYPE: javadoc
124+
lint:
125+
needs: filter
126+
if: ${{ needs.filter.outputs.library == 'true' }}
127+
runs-on: ubuntu-latest
128+
steps:
129+
- uses: actions/checkout@v4
130+
with:
131+
fetch-depth: 0
132+
- uses: actions/setup-java@v4
133+
with:
134+
distribution: temurin
135+
java-version: 17
136+
- run: java -version
137+
- run: .kokoro/build.sh
138+
env:
139+
JOB_TYPE: lint
140+
HEAD_SHA: ${{ github.event.pull_request.head.sha || github.sha }}
141+
BASE_SHA: ${{ github.event.pull_request.base.sha || github.event.before }}
142+
clirr:
143+
needs: filter
144+
if: ${{ needs.filter.outputs.library == 'true' }}
145+
runs-on: ubuntu-latest
146+
steps:
147+
- uses: actions/checkout@v4
148+
- uses: actions/setup-java@v4
149+
with:
150+
distribution: temurin
151+
java-version: 11
152+
- run: java -version
153+
- run: .kokoro/build.sh
154+
env:
155+
JOB_TYPE: clirr
156+
BUILD_SUBDIR: java-bigtable
Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
# Copyright 2023 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-bigtable conformance
22+
env:
23+
BUILD_SUBDIR: java-bigtable
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-bigtable/**'
37+
conformance:
38+
needs: filter
39+
if: ${{ needs.filter.outputs.library == 'true' }}
40+
runs-on: ubuntu-latest
41+
steps:
42+
- uses: actions/checkout@v4
43+
- uses: actions/checkout@v4
44+
with:
45+
repository: googleapis/cloud-bigtable-clients-test
46+
ref: main
47+
path: cloud-bigtable-clients-test
48+
- uses: actions/setup-java@v4
49+
with:
50+
distribution: zulu
51+
java-version: 11
52+
- uses: actions/setup-go@v5
53+
with:
54+
go-version: '>=1.20.2'
55+
- run: java -version
56+
- run: go version
57+
- run: .kokoro/bigtable-conformance.sh

0 commit comments

Comments
 (0)