Skip to content

Commit cf3dcd6

Browse files
Merge branch 'main' into jdbc/add-jvm-trustStore-support
2 parents ce6f7fc + c6532ac commit cf3dcd6

83 files changed

Lines changed: 19488 additions & 2354 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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959
strategy:
6060
fail-fast: false
6161
matrix:
62-
java: [11, 17, 21, 25]
62+
java: [11, 17, 21, 25, 26]
6363
steps:
6464
- name: Get current week within the year
6565
id: date
@@ -226,7 +226,7 @@ jobs:
226226
fail-fast: false
227227
matrix:
228228
package: ${{ fromJSON(needs.changes.outputs.packages) }}
229-
java: [11, 17, 21, 25]
229+
java: [11, 17, 21, 25, 26]
230230
steps:
231231
- name: Get current week within the year
232232
id: date

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
strategy:
4343
fail-fast: false
4444
matrix:
45-
java: [11, 17, 21, 25]
45+
java: [11, 17, 21, 25, 26]
4646
steps:
4747
- uses: actions/checkout@v4
4848
- uses: actions/setup-java@v4

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
strategy:
5050
fail-fast: false
5151
matrix:
52-
java: [11, 17, 21, 25]
52+
java: [11, 17, 21, 25, 26]
5353
steps:
5454
- uses: actions/checkout@v4
5555
- uses: actions/setup-java@v4

.github/workflows/java-bigtable-ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
strategy:
4242
fail-fast: false
4343
matrix:
44-
java: [11, 17, 21, 25]
44+
java: [11, 17, 21, 25, 26]
4545
steps:
4646
- uses: actions/checkout@v4
4747
- uses: actions/setup-java@v4

.github/workflows/java-firestore-ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
strategy:
4242
fail-fast: false
4343
matrix:
44-
java: [11, 17, 21, 25]
44+
java: [11, 17, 21, 25, 26]
4545
steps:
4646
- uses: actions/checkout@v4
4747
- uses: actions/setup-java@v4

.github/workflows/java-pubsub-ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
strategy:
4242
fail-fast: false
4343
matrix:
44-
java: [11, 17, 21, 25]
44+
java: [11, 17, 21, 25, 26]
4545
steps:
4646
- uses: actions/checkout@v4
4747
- uses: actions/setup-java@v4

.github/workflows/java-spanner-jdbc-ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
strategy:
4848
fail-fast: false
4949
matrix:
50-
java: [11, 17, 21, 25]
50+
java: [11, 17, 21, 25, 26]
5151
steps:
5252
- uses: actions/checkout@v4
5353
- uses: actions/setup-java@v4

.github/workflows/java-storage-nio-ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
strategy:
4848
fail-fast: false
4949
matrix:
50-
java: [11, 17, 21, 25]
50+
java: [11, 17, 21, 25, 26]
5151
steps:
5252
- uses: actions/checkout@v4
5353
- uses: actions/setup-java@v4

.github/workflows/librarian_generation_check.yaml

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,19 @@
1111
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
14-
name: Librarian - Generate diff check on pull requests
14+
name: Librarian - Generate diff check on main
1515
on:
16-
pull_request:
16+
push:
17+
branches:
18+
- main
19+
workflow_dispatch:
1720

1821
jobs:
1922
library_generation:
2023
runs-on: ubuntu-24.04
24+
permissions:
25+
contents: read
26+
issues: write
2127
steps:
2228
- uses: actions/checkout@v4
2329
with:
@@ -70,3 +76,12 @@ jobs:
7076
echo "Regeneration produced code changes! Please run 'librarian generate --all' to update the generated files."
7177
exit 1
7278
fi
79+
- name: Create issue if previous step fails
80+
if: ${{ failure() && github.ref == 'refs/heads/main' }}
81+
uses: googleapis/librarian/.github/actions/create-issue-on-failure@main
82+
with:
83+
title: "Librarian generate diff check failed on main branch"
84+
body: |
85+
The librarian generate diff check failed on main branch.
86+
87+
Please check the logs: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}

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

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
name: sdk-platform-java units
2727
strategy:
2828
matrix:
29-
java: [ 11, 17, 21, 25 ]
29+
java: [ 11, 17, 21, 25, 26 ]
3030
steps:
3131
- uses: actions/checkout@v4
3232
- uses: actions/setup-java@v4
@@ -164,16 +164,21 @@ jobs:
164164
run: |
165165
bazelisk --batch test //sdk-platform-java/test/integration/... --test_output=errors
166166
167-
bazel-25:
167+
# JDK 24+ permanently disables Security Manager. Bazel's default test runner tries to install it.
168+
# We must explicitly disable this behavior using shouldInstallTestSecurityManager=false.
169+
bazel-no-security-manager-jdk24-plus:
168170
needs: filter
169171
if: ${{ needs.filter.outputs.library == 'true' }}
170172
runs-on: ubuntu-22.04
171-
name: sdk-platform-java integration (25)
173+
name: sdk-platform-java integration (JDK 24+)
174+
strategy:
175+
matrix:
176+
java: [ 25, 26 ]
172177
steps:
173178
- uses: actions/checkout@v4
174179
- uses: actions/setup-java@v4
175180
with:
176-
java-version: 25
181+
java-version: ${{ matrix.java }}
177182
distribution: temurin
178183
cache: maven
179184
- run: bazelisk version

0 commit comments

Comments
 (0)