Skip to content

Commit bab29b6

Browse files
lqiu96lqiu96
authored
Merge branch 'main' into pqc-grpc-poc-1.83.0
2 parents 5076794 + 3087e43 commit bab29b6

870 files changed

Lines changed: 156838 additions & 23682 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/workflows/ci.yaml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ jobs:
7474
if: ${{ needs.bulk-filter.outputs.runnable == 'true' }}
7575
with:
7676
persist-credentials: false
77-
- uses: actions/setup-java@c1e323688fd81a25caa38c78aa6df2d33d3e20d9 # v4
77+
- uses: actions/setup-java@c1e323688fd81a25caa38c78aa6df2d33d3e20d9 # v4.8.0
7878
if: ${{ needs.bulk-filter.outputs.runnable == 'true' }}
7979
with:
8080
distribution: temurin
@@ -105,7 +105,7 @@ jobs:
105105
if: ${{ needs.bulk-filter.outputs.runnable == 'true' }}
106106
with:
107107
persist-credentials: false
108-
- uses: actions/setup-java@c1e323688fd81a25caa38c78aa6df2d33d3e20d9 # v4
108+
- uses: actions/setup-java@c1e323688fd81a25caa38c78aa6df2d33d3e20d9 # v4.8.0
109109
if: ${{ needs.bulk-filter.outputs.runnable == 'true' }}
110110
with:
111111
java-version: 8
@@ -116,7 +116,7 @@ jobs:
116116
if: ${{ needs.bulk-filter.outputs.runnable == 'true' }}
117117
run: echo "SUREFIRE_JVM_OPT=-Djvm=${JAVA_HOME}/bin/java" >> $GITHUB_ENV
118118
shell: bash
119-
- uses: actions/setup-java@c1e323688fd81a25caa38c78aa6df2d33d3e20d9 # v4
119+
- uses: actions/setup-java@c1e323688fd81a25caa38c78aa6df2d33d3e20d9 # v4.8.0
120120
if: ${{ needs.bulk-filter.outputs.runnable == 'true' }}
121121
with:
122122
java-version: 11
@@ -277,7 +277,7 @@ jobs:
277277
- uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
278278
with:
279279
persist-credentials: false
280-
- uses: actions/setup-java@c1e323688fd81a25caa38c78aa6df2d33d3e20d9 # v4
280+
- uses: actions/setup-java@c1e323688fd81a25caa38c78aa6df2d33d3e20d9 # v4.8.0
281281
with:
282282
distribution: temurin
283283
java-version: ${{matrix.java}}
@@ -302,7 +302,7 @@ jobs:
302302
- uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
303303
with:
304304
persist-credentials: false
305-
- uses: actions/setup-java@c1e323688fd81a25caa38c78aa6df2d33d3e20d9 # v4
305+
- uses: actions/setup-java@c1e323688fd81a25caa38c78aa6df2d33d3e20d9 # v4.8.0
306306
with:
307307
java-version: 11
308308
distribution: temurin
@@ -319,7 +319,7 @@ jobs:
319319
env:
320320
BUILD_SUBDIR: ${{matrix.package}}
321321
JOB_TYPE: install
322-
- uses: actions/setup-java@c1e323688fd81a25caa38c78aa6df2d33d3e20d9 # v4
322+
- uses: actions/setup-java@c1e323688fd81a25caa38c78aa6df2d33d3e20d9 # v4.8.0
323323
with:
324324
java-version: ${{matrix.java}}
325325
distribution: temurin
@@ -349,7 +349,7 @@ jobs:
349349
- uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
350350
with:
351351
persist-credentials: false
352-
- uses: actions/setup-java@c1e323688fd81a25caa38c78aa6df2d33d3e20d9 # v4
352+
- uses: actions/setup-java@c1e323688fd81a25caa38c78aa6df2d33d3e20d9 # v4.8.0
353353
with:
354354
distribution: temurin
355355
java-version: 11
@@ -368,7 +368,7 @@ jobs:
368368
- uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
369369
with:
370370
persist-credentials: false
371-
- uses: actions/setup-java@c1e323688fd81a25caa38c78aa6df2d33d3e20d9 # v4
371+
- uses: actions/setup-java@c1e323688fd81a25caa38c78aa6df2d33d3e20d9 # v4.8.0
372372
with:
373373
distribution: temurin
374374
java-version: 17
@@ -396,7 +396,7 @@ jobs:
396396
- uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
397397
with:
398398
persist-credentials: false
399-
- uses: actions/setup-java@c1e323688fd81a25caa38c78aa6df2d33d3e20d9 # v4
399+
- uses: actions/setup-java@c1e323688fd81a25caa38c78aa6df2d33d3e20d9 # v4.8.0
400400
with:
401401
distribution: temurin
402402
java-version: 11
@@ -415,7 +415,7 @@ jobs:
415415
with:
416416
fetch-depth: 0
417417
persist-credentials: false
418-
- uses: actions/setup-java@c1e323688fd81a25caa38c78aa6df2d33d3e20d9 # v4
418+
- uses: actions/setup-java@c1e323688fd81a25caa38c78aa6df2d33d3e20d9 # v4.8.0
419419
with:
420420
distribution: temurin
421421
java-version: 17
@@ -436,7 +436,7 @@ jobs:
436436
- uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
437437
with:
438438
persist-credentials: false
439-
- uses: actions/setup-java@c1e323688fd81a25caa38c78aa6df2d33d3e20d9 # v4
439+
- uses: actions/setup-java@c1e323688fd81a25caa38c78aa6df2d33d3e20d9 # v4.8.0
440440
with:
441441
distribution: temurin
442442
java-version: 11
@@ -456,7 +456,7 @@ jobs:
456456
- uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
457457
with:
458458
persist-credentials: false
459-
- uses: actions/setup-java@c1e323688fd81a25caa38c78aa6df2d33d3e20d9 # v4
459+
- uses: actions/setup-java@c1e323688fd81a25caa38c78aa6df2d33d3e20d9 # v4.8.0
460460
with:
461461
java-version: 11
462462
distribution: temurin

‎.github/workflows/create_additional_release_tag.yaml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,11 @@ on:
77
release:
88
types: [published]
99
workflow_dispatch:
10+
inputs:
11+
target_ref:
12+
description: 'Git ref (tag or SHA) to check out and tag. Defaults to branch HEAD if empty.'
13+
required: false
14+
default: ''
1015
jobs:
1116
build:
1217
runs-on: ubuntu-latest
@@ -18,6 +23,7 @@ jobs:
1823
- name: Checkout code
1924
uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
2025
with:
26+
ref: ${{ inputs.target_ref || github.ref }}
2127
token: ${{ secrets.CLOUD_JAVA_BOT_GITHUB_TOKEN }}
2228
persist-credentials: false
2329
- name: Set up Git
@@ -38,7 +44,7 @@ jobs:
3844
continue
3945
fi
4046
git tag $TAG_NAME
41-
git push origin $TAG_NAME
47+
git push https://x-access-token:${GH_TOKEN}@github.com/${GITHUB_REPOSITORY}.git $TAG_NAME
4248
if [ "${ARTIFACT_ID}" = "libraries-bom" ]; then
4349
echo "Creating GitHub Release for ${TAG_NAME}"
4450
gh release create "${TAG_NAME}" --title "GCP Libraries BOM ${VERSION}" --notes "libraries-bom release."

‎.github/workflows/formatter-version-check.yaml‎

Lines changed: 92 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,92 @@
1+
# Copyright 2026 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+
# https://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+
15+
permissions:
16+
contents: read
17+
18+
name: Librarian - Formatter Version Check
19+
20+
on:
21+
workflow_dispatch: # Allow manual trigger
22+
pull_request:
23+
24+
concurrency:
25+
group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}
26+
cancel-in-progress: true
27+
28+
jobs:
29+
filter:
30+
name: Filter changed files
31+
runs-on: ubuntu-latest
32+
outputs:
33+
should_run: ${{ steps.filter.outputs.should_run }}
34+
steps:
35+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
36+
with:
37+
persist-credentials: false
38+
- uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2
39+
id: filter
40+
with:
41+
filters: |
42+
should_run:
43+
- 'librarian.yaml'
44+
- 'java-shared-config/java-shared-config/pom.xml'
45+
- '.github/workflows/formatter-version-check.yaml'
46+
47+
check-formatter-version:
48+
name: Check Formatter Version
49+
needs: filter
50+
if: ${{ github.event_name == 'workflow_dispatch' || needs.filter.outputs.should_run == 'true' }}
51+
runs-on: ubuntu-latest
52+
steps:
53+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
54+
with:
55+
persist-credentials: false
56+
- name: Extract formatter version from pom.xml
57+
id: extract_pom_version
58+
shell: bash
59+
run: |
60+
version=$(awk -F'[<>]' '/google-java-format.version/{print $3; exit}' java-shared-config/java-shared-config/pom.xml | tr -d '"')
61+
echo "version=$version" >> "$GITHUB_OUTPUT"
62+
- name: Extract formatter version from librarian.yaml
63+
id: extract_librarian_version
64+
shell: bash
65+
run: |
66+
version=$(yq '.tools.maven[] | select(.name == "google-java-format") | .version' librarian.yaml | tr -d '"')
67+
echo "version=$version" >> "$GITHUB_OUTPUT"
68+
- name: Verify formatter versions match
69+
shell: bash
70+
run: |
71+
echo "Formatter version in pom.xml: ${POM_VERSION}"
72+
echo "Formatter version in librarian.yaml: ${LIBRARIAN_VERSION}"
73+
74+
if [ -z "${POM_VERSION}" ]; then
75+
echo "Error: Could not extract google-java-format.version from java-shared-config/java-shared-config/pom.xml"
76+
exit 1
77+
fi
78+
79+
if [ -z "${LIBRARIAN_VERSION}" ]; then
80+
echo "Error: Could not extract google-java-format version from librarian.yaml"
81+
exit 1
82+
fi
83+
84+
if [ "${POM_VERSION}" != "${LIBRARIAN_VERSION}" ]; then
85+
echo "Mismatch: librarian.yaml has version '${LIBRARIAN_VERSION}', but java-shared-config/java-shared-config/pom.xml has version '${POM_VERSION}'"
86+
exit 1
87+
fi
88+
89+
echo "Formatter versions are in sync!"
90+
env:
91+
POM_VERSION: ${{ steps.extract_pom_version.outputs.version }}
92+
LIBRARIAN_VERSION: ${{ steps.extract_librarian_version.outputs.version }}

‎.github/workflows/google-auth-library-java-ci.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
- uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
5353
with:
5454
persist-credentials: false
55-
- uses: actions/setup-java@c1e323688fd81a25caa38c78aa6df2d33d3e20d9 # v4
55+
- uses: actions/setup-java@c1e323688fd81a25caa38c78aa6df2d33d3e20d9 # v4.8.0
5656
with:
5757
distribution: temurin
5858
java-version: ${{matrix.java}}
@@ -70,7 +70,7 @@ jobs:
7070
- uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
7171
with:
7272
persist-credentials: false
73-
- uses: actions/setup-java@17f84c3641ba7b8f6deff6309fc4c864478f5d62 # v3
73+
- uses: actions/setup-java@17f84c3641ba7b8f6deff6309fc4c864478f5d62 # v3.14.1
7474
with:
7575
distribution: temurin
7676
java-version: 11
@@ -87,7 +87,7 @@ jobs:
8787
- uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
8888
with:
8989
persist-credentials: false
90-
- uses: actions/setup-java@c1e323688fd81a25caa38c78aa6df2d33d3e20d9 # v4
90+
- uses: actions/setup-java@c1e323688fd81a25caa38c78aa6df2d33d3e20d9 # v4.8.0
9191
with:
9292
distribution: temurin
9393
java-version: 17

‎.github/workflows/java-bigquery-jdbc-ci.yaml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959
- uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
6060
with:
6161
persist-credentials: false
62-
- uses: actions/setup-java@c1e323688fd81a25caa38c78aa6df2d33d3e20d9 # v4
62+
- uses: actions/setup-java@c1e323688fd81a25caa38c78aa6df2d33d3e20d9 # v4.8.0
6363
with:
6464
distribution: temurin
6565
java-version: ${{matrix.java}}
@@ -77,7 +77,7 @@ jobs:
7777
- uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
7878
with:
7979
persist-credentials: false
80-
- uses: actions/setup-java@c1e323688fd81a25caa38c78aa6df2d33d3e20d9 # v4
80+
- uses: actions/setup-java@c1e323688fd81a25caa38c78aa6df2d33d3e20d9 # v4.8.0
8181
with:
8282
java-version: 8
8383
distribution: temurin
@@ -86,7 +86,7 @@ jobs:
8686
# https://maven.apache.org/surefire/maven-surefire-plugin/test-mojo.html#jvm
8787
run: echo "SUREFIRE_JVM_OPT=-Djvm=${JAVA_HOME}/bin/java -P !java17" >> $GITHUB_ENV
8888
shell: bash
89-
- uses: actions/setup-java@c1e323688fd81a25caa38c78aa6df2d33d3e20d9 # v4
89+
- uses: actions/setup-java@c1e323688fd81a25caa38c78aa6df2d33d3e20d9 # v4.8.0
9090
with:
9191
java-version: 17
9292
distribution: temurin
@@ -105,7 +105,7 @@ jobs:
105105
- uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
106106
with:
107107
persist-credentials: false
108-
- uses: actions/setup-java@c1e323688fd81a25caa38c78aa6df2d33d3e20d9 # v4
108+
- uses: actions/setup-java@c1e323688fd81a25caa38c78aa6df2d33d3e20d9 # v4.8.0
109109
with:
110110
distribution: temurin
111111
java-version: 8
@@ -121,7 +121,7 @@ jobs:
121121
- uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
122122
with:
123123
persist-credentials: false
124-
- uses: actions/setup-java@c1e323688fd81a25caa38c78aa6df2d33d3e20d9 # v4
124+
- uses: actions/setup-java@c1e323688fd81a25caa38c78aa6df2d33d3e20d9 # v4.8.0
125125
with:
126126
distribution: temurin
127127
java-version: 17
@@ -134,7 +134,7 @@ jobs:
134134
- uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
135135
with:
136136
persist-credentials: false
137-
- uses: actions/setup-java@c1e323688fd81a25caa38c78aa6df2d33d3e20d9 # v4
137+
- uses: actions/setup-java@c1e323688fd81a25caa38c78aa6df2d33d3e20d9 # v4.8.0
138138
with:
139139
distribution: temurin
140140
java-version: 17
@@ -151,7 +151,7 @@ jobs:
151151
with:
152152
fetch-depth: 0
153153
persist-credentials: false
154-
- uses: actions/setup-java@c1e323688fd81a25caa38c78aa6df2d33d3e20d9 # v4
154+
- uses: actions/setup-java@c1e323688fd81a25caa38c78aa6df2d33d3e20d9 # v4.8.0
155155
with:
156156
distribution: temurin
157157
java-version: 17

0 commit comments

Comments
 (0)