Skip to content

Commit 665298b

Browse files
authored
Merge branch 'main' into kirl/fix_htapi_fallback
2 parents e0a1c7c + b25100d commit 665298b

4,560 files changed

Lines changed: 1015070 additions & 32691 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: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ jobs:
6161
units:
6262
runs-on: ubuntu-latest
6363
needs: generated-libraries-filter
64-
if: ${{ needs.generated-libraries-filter.outputs.runnable == 'true' }}
6564
strategy:
6665
fail-fast: false
6766
matrix:
@@ -84,7 +83,6 @@ jobs:
8483
units-8-runtime:
8584
runs-on: ubuntu-latest
8685
needs: generated-libraries-filter
87-
if: ${{ needs.generated-libraries-filter.outputs.runnable == 'true' }}
8886
name: "units (8)"
8987
steps:
9088
- uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4.4.0

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

Lines changed: 1 addition & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@ permissions:
1818
name: Librarian - Showcase Version Check
1919

2020
on:
21-
schedule:
22-
- cron: '30 3 * * *' # Run daily at 3:30 AM UTC
2321
workflow_dispatch: # Allow manual trigger
2422
pull_request:
2523

@@ -43,10 +41,8 @@ jobs:
4341
4442
check-showcase-version:
4543
needs: filter
46-
if: ${{ github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' || needs.filter.outputs.should_run == 'true' }}
44+
if: ${{ github.event_name == 'workflow_dispatch' || needs.filter.outputs.should_run == 'true' }}
4745
runs-on: ubuntu-latest
48-
permissions:
49-
issues: write
5046
steps:
5147
- uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
5248
with:
@@ -91,29 +87,10 @@ jobs:
9187
# 3. Cross-reference with librarian.yaml
9288
if [ "${STEPS_EXTRACT_COMMIT_OUTPUTS_COMMIT}" != "$EXPECTED_COMMIT" ]; then
9389
echo "Mismatch: librarian.yaml has commit '${STEPS_EXTRACT_COMMIT_OUTPUTS_COMMIT}', but tag '$TAG_NAME' is at commit '$EXPECTED_COMMIT'"
94-
echo "MISMATCH=true" >> "$GITHUB_ENV"
9590
exit 2
9691
fi
9792
9893
echo "Showcase version and commit are in sync!"
9994
env:
10095
STEPS_EXTRACT_VERSION_OUTPUTS_VERSION: ${{ steps.extract_version.outputs.version }}
10196
STEPS_EXTRACT_COMMIT_OUTPUTS_COMMIT: ${{ steps.extract_commit.outputs.commit }}
102-
- name: Create issue on mismatch
103-
if: failure() && env.MISMATCH == 'true'
104-
env:
105-
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
106-
run: |
107-
gh issue create \
108-
-R "${{ github.repository }}" \
109-
-t "Showcase Version Mismatch: librarian.yaml and pom.xml out of sync" \
110-
-b "The Showcase version in java-showcase/gapic-showcase/pom.xml and the commit in librarian.yaml do not match. Please update them to match. See logs: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
111-
- name: Create issue on workflow failure
112-
if: failure() && env.MISMATCH != 'true'
113-
env:
114-
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
115-
run: |
116-
gh issue create \
117-
-R "${{ github.repository }}" \
118-
-t "Showcase Version Check Workflow Failure" \
119-
-b "The Showcase Version Check workflow has failed due to an unexpected execution error. Please check the logs at ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }} for details."

‎.kokoro/build.sh‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ case ${JOB_TYPE} in
238238
# Format those specific modules instead of the entire codebase, reducing format check time.
239239
# The --relative flag is when building in the submodule as only files modified in the module
240240
# should be accounted for.
241-
changed_file_list=$(git diff --name-only "${BASE_SHA}" "${HEAD_SHA}" --relative)
241+
changed_file_list=$(git diff --name-only "${BASE_SHA}...${HEAD_SHA}" --relative)
242242
echo "${changed_file_list}"
243243

244244
has_code_change="false"
@@ -301,6 +301,9 @@ case ${JOB_TYPE} in
301301
unique_modules=$(printf '%s\n' "${changed_modules[@]}" | sort -u | paste -sd ',' -)
302302
MODULE_FILTER="-pl ${unique_modules}"
303303
echo "Formatting only changed modules: ${unique_modules}"
304+
else
305+
echo "No formatting-eligible Java modules affected. Skipping linter check."
306+
exit 0
304307
fi
305308
else
306309
echo "BASE_SHA or HEAD_SHA is empty. Cannot continue linting."

‎WORKSPACE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ load("@rules_jvm_external//:defs.bzl", "maven_install")
6767
load("@io_grpc_grpc_java//:repositories.bzl", "IO_GRPC_GRPC_JAVA_ARTIFACTS")
6868
load("@io_grpc_grpc_java//:repositories.bzl", "IO_GRPC_GRPC_JAVA_OVERRIDE_TARGETS")
6969

70-
_gapic_generator_java_version = "2.77.0" # {x-version-update:gapic-generator-java:current}
70+
_gapic_generator_java_version = "2.78.0-SNAPSHOT" # {x-version-update:gapic-generator-java:current}
7171

7272
maven_install(
7373
artifacts = [

0 commit comments

Comments
 (0)