Skip to content

Commit ed95dcd

Browse files
lqiu96lqiu96
authored
Merge branch 'main' into maven-fast-profile
2 parents 46cf801 + c2147fc commit ed95dcd

File tree

2,654 files changed

+38392
-417295
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,654 files changed

+38392
-417295
lines changed

‎.github/release-please.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ primaryBranch: main
22
releaseType: java-yoshi
33
manifest: true
44
handleGHRelease: true
5+
onDemand: true
56
branches:
67
- branch: 1.0.x
78
releaseType: java-backport

‎.github/workflows/generated_files_sync.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ on:
1717
pull_request:
1818
name: generation diff
1919
env:
20-
library_generation_image_tag: 2.68.1-SNAPSHOT # {x-version-update:gapic-generator-java:current}
20+
library_generation_image_tag: 2.69.0 # {x-version-update:gapic-generator-java:current}
2121
jobs:
2222
root-pom:
2323
# root pom.xml does not have diff from generated one

‎.github/workflows/hermetic_library_generation.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,4 +44,4 @@ jobs:
4444
head_ref: ${{ github.head_ref }}
4545
token: ${{ secrets.CLOUD_JAVA_BOT_GITHUB_TOKEN }}
4646
force_regenerate_all: ${{ github.event.pull_request.head.ref == 'generate-libraries-main' }}
47-
image_tag: 2.68.1-SNAPSHOT # {x-version-update:gapic-generator-java:current}
47+
image_tag: 2.69.0 # {x-version-update:gapic-generator-java:current}

‎.github/workflows/sdk-platform-java-ci.yaml‎

Lines changed: 77 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,11 @@ jobs:
3333
cache: maven
3434
- run: java -version
3535
- name: Unit Tests
36-
run: |
37-
mvn test --batch-mode --no-transfer-progress -Pquick-build \
38-
-DenableTestCoverage
39-
working-directory: sdk-platform-java
36+
shell: bash
37+
run: .kokoro/build.sh
38+
env:
39+
BUILD_SUBDIR: sdk-platform-java
40+
JOB_TYPE: test
4041
# The `envVarTest` profile runs tests that require an environment variable
4142
- name: Env Var Tests
4243
run: |
@@ -49,10 +50,12 @@ jobs:
4950
GOOGLE_SDK_JAVA_LOGGING: true
5051
working-directory: sdk-platform-java
5152
- run: bazelisk version
52-
- name: Install Maven modules
53-
run: |
54-
mvn install -B -ntp -Pquick-build -DskipTests
55-
working-directory: sdk-platform-java
53+
- name: Install all modules using Java 11
54+
shell: bash
55+
run: .kokoro/build.sh
56+
env:
57+
BUILD_SUBDIR: sdk-platform-java
58+
JOB_TYPE: install
5659
- name: Integration Tests
5760
run: |
5861
bazelisk --batch test //sdk-platform-java/test/integration/...
@@ -89,26 +92,29 @@ jobs:
8992
cache: maven
9093
- run: java -version
9194
- name: Unit Tests
92-
run: |
93-
mvn test --batch-mode --no-transfer-progress -Pquick-build \
94-
-DenableTestCoverage
95-
working-directory: sdk-platform-java
95+
shell: bash
96+
run: .kokoro/build.sh
97+
env:
98+
BUILD_SUBDIR: sdk-platform-java
99+
JOB_TYPE: test
96100
# The `envVarTest` profile runs tests that require an environment variable
97101
- name: Env Var Tests
98-
run: |
99-
mvn test --batch-mode --no-transfer-progress -Pquick-build \
100-
-DenableTestCoverage -PenvVarTest
101-
# Set the Env Var for this step only
102+
shell: bash
103+
run: .kokoro/build.sh
102104
env:
105+
BUILD_SUBDIR: sdk-platform-java
106+
JOB_TYPE: test
107+
SUREFIRE_JVM_OPT: '-PenvVarTest'
103108
GOOGLE_CLOUD_UNIVERSE_DOMAIN: random.com
104109
GOOGLE_CLOUD_ENABLE_DIRECT_PATH_XDS: true
105110
GOOGLE_SDK_JAVA_LOGGING: true
106-
working-directory: sdk-platform-java
107111
- run: bazelisk version
108-
- name: Install Maven modules
109-
run: |
110-
mvn install -B -ntp -Pquick-build -DskipTests
111-
working-directory: sdk-platform-java
112+
- name: Install all modules using Java 11
113+
shell: bash
114+
run: .kokoro/build.sh
115+
env:
116+
BUILD_SUBDIR: sdk-platform-java
117+
JOB_TYPE: install
112118
- name: Integration Tests
113119
run: |
114120
bazelisk --batch test //sdk-platform-java/test/integration/...
@@ -127,26 +133,29 @@ jobs:
127133
cache: maven
128134
- run: java -version
129135
- name: Unit Tests
130-
run: |
131-
mvn test --batch-mode --no-transfer-progress -Pquick-build \
132-
-DenableTestCoverage
133-
working-directory: sdk-platform-java
136+
shell: bash
137+
run: .kokoro/build.sh
138+
env:
139+
BUILD_SUBDIR: sdk-platform-java
140+
JOB_TYPE: test
134141
# The `envVarTest` profile runs tests that require an environment variable
135142
- name: Env Var Tests
136-
run: |
137-
mvn test --batch-mode --no-transfer-progress -Pquick-build \
138-
-DenableTestCoverage -PenvVarTest
139-
# Set the Env Var for this step only
143+
shell: bash
144+
run: .kokoro/build.sh
140145
env:
146+
BUILD_SUBDIR: sdk-platform-java
147+
JOB_TYPE: test
148+
SUREFIRE_JVM_OPT: '-PenvVarTest'
141149
GOOGLE_CLOUD_UNIVERSE_DOMAIN: random.com
142150
GOOGLE_CLOUD_ENABLE_DIRECT_PATH_XDS: true
143151
GOOGLE_SDK_JAVA_LOGGING: true
144-
working-directory: sdk-platform-java
145152
- run: bazelisk version
146-
- name: Install Maven modules
147-
run: |
148-
mvn install -B -ntp -Pquick-build -DskipTests
149-
working-directory: sdk-platform-java
153+
- name: Install all modules using Java 11
154+
shell: bash
155+
run: .kokoro/build.sh
156+
env:
157+
BUILD_SUBDIR: sdk-platform-java
158+
JOB_TYPE: install
150159
- name: Integration Tests
151160
# note need to set shouldInstallTestSecurityManager=false due to https://github.com/bazelbuild/bazel/issues/24354
152161
run: |
@@ -164,12 +173,17 @@ jobs:
164173
java-version: 8
165174
distribution: temurin
166175
cache: maven
176+
- name: Compile with Java 17 and run tests with Java 8
177+
shell: bash
178+
run: .kokoro/build.sh
179+
env:
180+
BUILD_SUBDIR: sdk-platform-java
181+
JOB_TYPE: install
167182
- run: echo "JAVA8_HOME=${JAVA_HOME}" >> $GITHUB_ENV
168183
- uses: actions/setup-java@v3
169184
with:
170185
java-version: 17
171186
distribution: temurin
172-
- name: Compile with Java 17 and run tests with Java 8
173187
shell: bash
174188
run: |
175189
set -x
@@ -214,9 +228,10 @@ jobs:
214228
cache: maven
215229
- name: Install all modules using Java 11
216230
shell: bash
217-
run: |
218-
mvn -V -B -ntp clean install -Pquick-build -DskipTests
219-
working-directory: sdk-platform-java
231+
run: .kokoro/build.sh
232+
env:
233+
BUILD_SUBDIR: sdk-platform-java
234+
JOB_TYPE: install
220235
- uses: actions/setup-java@v3
221236
with:
222237
java-version: 8
@@ -264,9 +279,10 @@ jobs:
264279
cache: maven
265280
- name: Install all modules using Java 11
266281
shell: bash
267-
run: |
268-
mvn install -B -ntp -Pquick-build -DskipTests
269-
working-directory: sdk-platform-java
282+
run: .kokoro/build.sh
283+
env:
284+
BUILD_SUBDIR: sdk-platform-java
285+
JOB_TYPE: install
270286
- uses: actions/setup-java@v3
271287
with:
272288
java-version: 8
@@ -338,9 +354,11 @@ jobs:
338354
distribution: temurin
339355
- run: mvn -version
340356
- name: Install Maven modules
341-
run: |
342-
mvn install -B -ntp -Pquick-build -DskipTests
343-
working-directory: sdk-platform-java
357+
shell: bash
358+
run: .kokoro/build.sh
359+
env:
360+
BUILD_SUBDIR: sdk-platform-java
361+
JOB_TYPE: test
344362
- name: Showcase golden tests
345363
working-directory: sdk-platform-java/java-showcase
346364
run: |
@@ -417,9 +435,11 @@ jobs:
417435
distribution: temurin
418436
cache: maven
419437
- name: Install Maven modules
420-
run: |
421-
mvn install -B -ntp -Pquick-build -DskipTests
422-
working-directory: sdk-platform-java
438+
shell: bash
439+
run: .kokoro/build.sh
440+
env:
441+
BUILD_SUBDIR: sdk-platform-java
442+
JOB_TYPE: install
423443
- name: Install showcase to local maven repository
424444
run: |
425445
mvn install -B -ntp -T 1C -DskipTests
@@ -453,16 +473,11 @@ jobs:
453473
distribution: temurin
454474
cache: maven
455475
- name: Install Maven modules to local Maven repository
456-
run: |
457-
mvn install \
458-
-B -ntp \
459-
-Pquick-build \
460-
-Dorg.slf4j.simpleLogger.showDateTime=true \
461-
-Dorg.slf4j.simpleLogger.dateTimeFormat=HH:mm:ss:SSS \
462-
-DskipTests \
463-
-Dmaven.wagon.http.retryHandler.count=5 \
464-
-T 1C
465-
working-directory: sdk-platform-java
476+
shell: bash
477+
run: .kokoro/build.sh
478+
env:
479+
BUILD_SUBDIR: sdk-platform-java
480+
JOB_TYPE: install
466481
- name: Validate gapic-generator-java-bom
467482
uses: googleapis/java-cloud-bom/tests/validate-bom@47ad868794c5d38ee7eb95d69371a7a79f84d890
468483
with:
@@ -486,9 +501,11 @@ jobs:
486501
mvn test --batch-mode --no-transfer-progress
487502
working-directory: sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check
488503
- name: Install Maven modules
489-
run: |
490-
mvn install -B -ntp -Pquick-build -DskipTests
491-
working-directory: sdk-platform-java
504+
shell: bash
505+
run: .kokoro/build.sh
506+
env:
507+
BUILD_SUBDIR: sdk-platform-java
508+
JOB_TYPE: test
492509
- name: Unmanaged dependency check
493510
uses: ./sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check
494511
with:

‎.github/workflows/sdk-platform-java-dependency_compatibility_test.yaml‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,13 @@ jobs:
5050
if: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.dependencies-list != '' }}
5151
run: echo "DEPENDENCIES_LIST=${{ github.event.inputs.dependencies-list }}" >> $GITHUB_ENV
5252

53+
- name: Install sdk-platform-java modules
54+
shell: bash
55+
run: .kokoro/build.sh
56+
env:
57+
BUILD_SUBDIR: sdk-platform-java
58+
JOB_TYPE: install
59+
5360
# Run in the root module which should test for everything except for showcase
5461
- name: Perform Dependency Compatibility Unit Testing
5562
shell: bash
@@ -61,12 +68,6 @@ jobs:
6168
fi
6269
working-directory: sdk-platform-java
6370

64-
# Install the modules for showcase (Shared-Deps is required to run showcase)
65-
- name: Install sdk-platform-java's modules
66-
# gapic-generator-java requires Java 8 and is irrelevant for this CI
67-
run: mvn -q -B -ntp install --projects '!gapic-generator-java' -Pquick-build -DskipTests -T 1C
68-
working-directory: sdk-platform-java
69-
7071
# Set up local showcase server to run the showcase ITs
7172
- name: Parse showcase version
7273
working-directory: sdk-platform-java/java-showcase/gapic-showcase

‎.github/workflows/sdk-platform-java-downstream.yaml‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,9 @@ jobs:
3232
matrix:
3333
repo:
3434
- java-bigtable
35-
- java-bigquery
3635
- java-firestore
3736
- java-pubsub
3837
- java-pubsublite
39-
- java-spanner-jdbc
40-
- java-spanner
41-
- java-storage
42-
- java-storage-nio
4338
steps:
4439
- uses: actions/checkout@v3
4540
- uses: actions/setup-java@v3
@@ -52,9 +47,9 @@ jobs:
5247
sudo apt-get update
5348
sudo apt-get -y install libxml2-utils
5449
- name: Test helper scripts
55-
run: ./sdk-platform-java/.kokoro/presubmit/common_test.sh
50+
run: .kokoro/common_test.sh
5651
- name: Perform downstream compatibility testing
57-
run: REPOS_UNDER_TEST="${{ matrix.repo }}" ./sdk-platform-java/.kokoro/presubmit/downstream-compatibility.sh
52+
run: REPOS_UNDER_TEST="${{ matrix.repo }}" .kokoro/downstream-compatibility.sh
5853
downstream-compatibility-spring-generator:
5954
needs: filter
6055
if: ${{ needs.filter.outputs.library == 'true' }}
@@ -73,4 +68,4 @@ jobs:
7368
sudo apt-get update
7469
sudo apt-get -y install libxml2-utils
7570
- name: Perform downstream compatibility testing
76-
run: ./sdk-platform-java/.kokoro/presubmit/downstream-compatibility-spring.sh
71+
run: .kokoro/downstream-compatibility-spring.sh

‎.github/workflows/sdk-platform-java-java_compatibility_check.yaml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,11 @@ jobs:
4343
distribution: temurin
4444
cache: maven
4545
- name: Install sdk-platform-modules to local Maven repository
46-
run: |
47-
mvn install -B -ntp -T 1C -DskipTests -Pquick-build
48-
working-directory: sdk-platform-java
46+
shell: bash
47+
run: .kokoro/build.sh
48+
env:
49+
BUILD_SUBDIR: sdk-platform-java
50+
JOB_TYPE: install
4951
- name: Check Java 8 compatibility for class files
5052
shell: bash
5153
run: |

0 commit comments

Comments
 (0)