Skip to content

Commit 24ccce4

Browse files
authored
Merge branch 'main' into renovate/com.google.cloud-libraries-bom-26.x
2 parents f2c9ec8 + 961af18 commit 24ccce4

File tree

1,502 files changed

+315838
-27426
lines changed

Some content is hidden

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

1,502 files changed

+315838
-27426
lines changed

.github/release-please.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,8 @@ branches:
2323
manifest: true
2424
handleGHRelease: true
2525
branch: 1.53.x
26+
- primaryBranch: main
27+
releaseType: java-backport
28+
manifest: true
29+
handleGHRelease: true
30+
branch: 1.61.x

.github/sync-repo-settings.yaml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,24 @@ branchProtectionRules:
9797
- header-check
9898
- library_generation
9999
- unmanaged_dependency_check
100+
- pattern: 1.61.x
101+
isAdminEnforced: true
102+
requiredApprovingReviewCount: 1
103+
requiresCodeOwnerReviews: true
104+
requiresStrictStatusChecks: false
105+
requiredStatusCheckContexts:
106+
- units (8)
107+
- units (11)
108+
- units (17)
109+
- cla/google
110+
- lint
111+
- 'Kokoro - Test: Integration'
112+
- 'Kokoro - Test: GraalVM Native Image A'
113+
- 'Kokoro - Test: GraalVM Native Image B'
114+
- 'Kokoro - Test: GraalVM Native Image C'
115+
- header-check
116+
- library_generation
117+
- unmanaged_dependency_check
100118
permissionRules:
101119
- team: yoshi-admins
102120
permission: admin

.github/workflows/ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ jobs:
127127
gcr.io/cloud-devrel-public-resources/java-library-generation:"${library_generation_image_tag}" \
128128
/src/library_generation/cli/entry_point.py validate-generation-config
129129
env:
130-
library_generation_image_tag: 2.60.0
130+
library_generation_image_tag: 2.60.1
131131
workspace_name: /workspace
132132

133133
# TODO: Uncomment the needed Github Actions

.github/workflows/generated_files_sync.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ on:
2020
pull_request:
2121
name: generation diff
2222
env:
23-
library_generation_image_tag: 2.60.0
23+
library_generation_image_tag: 2.60.1
2424
jobs:
2525
root-pom:
2626
# 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
@@ -37,7 +37,7 @@ jobs:
3737
with:
3838
fetch-depth: 0
3939
token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}
40-
- uses: googleapis/sdk-platform-java/.github/scripts@v2.59.0
40+
- uses: googleapis/sdk-platform-java/.github/scripts@v2.60.1
4141
if: env.SHOULD_RUN == 'true'
4242
with:
4343
base_ref: ${{ github.base_ref }}

.github/workflows/unmanaged_dependency_check.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ jobs:
1414
shell: bash
1515
run: mvn install -B -ntp -T 1C -DskipTests -Dclirr.skip -Dcheckstyle.skip -Denforcer.skip
1616
- name: Unmanaged dependency check
17-
uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.50.0
17+
uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.50.1
1818
with:
1919
bom-path: gapic-libraries-bom/pom.xml

.kokoro/nightly/graalvm-native-a.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Configure the docker image for kokoro-trampoline.
44
env_vars: {
55
key: "TRAMPOLINE_IMAGE"
6-
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.50.0"
6+
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.50.1"
77
}
88

99
env_vars: {

.kokoro/nightly/graalvm-native-b.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Configure the docker image for kokoro-trampoline.
44
env_vars: {
55
key: "TRAMPOLINE_IMAGE"
6-
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.50.0"
6+
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.50.1"
77
}
88

99
env_vars: {

.kokoro/nightly/graalvm-native-c.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Configure the docker image for kokoro-trampoline.
44
env_vars: {
55
key: "TRAMPOLINE_IMAGE"
6-
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:3.50.0"
6+
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:3.50.1"
77
}
88

99
env_vars: {

.kokoro/nightly/graalvm-sub-jobs/native-a/common.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ env_vars: {
2929

3030
env_vars: {
3131
key: "TRAMPOLINE_IMAGE"
32-
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.50.0"
32+
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.50.1"
3333
}
3434

3535
# TODO: remove this after we've migrated all tests and scripts

0 commit comments

Comments
 (0)