Skip to content

Commit cf17073

Browse files
renovate[bot]zeitlingergithub-actions[bot]
authored
fix(deps): update protobuf to v4.35.1 (#2221)
This PR contains the following updates: | Package | Type | Update | Change | [Age](https://docs.renovatebot.com/merge-confidence/) | [Confidence](https://docs.renovatebot.com/merge-confidence/) | |---|---|---|---|---|---| | [protoc](https://redirect.github.com/protocolbuffers/protobuf) | | minor | `35.0` → `35.1` | ![age](https://developer.mend.io/api/mc/badges/age/github-releases/protocolbuffers%2fprotobuf/35.1?slim=true) | ![confidence](https://developer.mend.io/api/mc/badges/confidence/github-releases/protocolbuffers%2fprotobuf/35.0/35.1?slim=true) | | [com.google.protobuf:protobuf-java](https://developers.google.com/protocol-buffers/) ([source](https://redirect.github.com/protocolbuffers/protobuf)) | compile | patch | `4.35.0` → `4.35.1` | ![age](https://developer.mend.io/api/mc/badges/age/maven/com.google.protobuf:protobuf-java/4.35.1?slim=true) | ![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/com.google.protobuf:protobuf-java/4.35.0/4.35.1?slim=true) | --- ### Release Notes <details> <summary>protocolbuffers/protobuf (protoc)</summary> ### [`v35.1`](https://redirect.github.com/protocolbuffers/protobuf/releases/tag/v35.1): Protocol Buffers v35.1 [Compare Source](https://redirect.github.com/protocolbuffers/protobuf/compare/v35.0...v35.1) ### Announcements - [Protobuf News](https://protobuf.dev/news/) may include additional announcements or pre-announcements for upcoming changes. ### Bazel - Bazel 9 tests for csharp, hpb, objc, php, python, rust and upb ([#&#8203;27598](https://redirect.github.com/protocolbuffers/protobuf/issues/27598)) ([`4469e38`](https://redirect.github.com/protocolbuffers/protobuf/commit/4469e3840bfa69ee3bd21721b402ff28076ecbab)) - Break protobuf dependency on Bazel's proto fragment. Only respect the Starlark versions of --proto\_toolchain\_for\*. This is a breaking change from 35.0, but matches the behavior in 34.x. ([`1f99c52`](https://redirect.github.com/protocolbuffers/protobuf/commit/1f99c52d771b86ca11274019c9b1a10280dd6050)) ### C++ - Add cord setters to repeated string fields. ([`6efa174`](https://redirect.github.com/protocolbuffers/protobuf/commit/6efa174ec6d455a4404b37f997daa69770ddde8f)) ### UPB (Python/PHP/Ruby C-Extension) - Avoid UB in upb by switching to the XCT section, which will run our constructors before the compiler-generated initializers. ([`c35b977`](https://redirect.github.com/protocolbuffers/protobuf/commit/c35b97728f4782343a37e590a3fd97c80fbadc55)) </details> --- ### Configuration 📅 **Schedule**: (UTC) - Branch creation - At any time (no schedule defined) - Automerge - At any time (no schedule defined) 🚦 **Automerge**: Enabled. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 👻 **Immortal**: This PR will be recreated if closed unmerged. Get [config help](https://redirect.github.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/prometheus/client_java). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0My4yMTkuMCIsInVwZGF0ZWRJblZlciI6IjQzLjIzNS4wIiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJkZXBlbmRlbmNpZXMiXX0=--> --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Gregor Zeitlinger <gregor.zeitlinger@grafana.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
1 parent ada6fbb commit cf17073

6 files changed

Lines changed: 944 additions & 939 deletions

File tree

.github/workflows/generate-protobuf.yml

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,15 @@ jobs:
4646
run: mise run generate
4747
- name: Validate and export generated sources as a patch
4848
run: |
49-
UNEXPECTED=$(git diff --name-only | grep -v '\.java$' || true)
49+
CHANGED=$(git diff --name-only; git ls-files --others --exclude-standard)
50+
UNEXPECTED=$(echo "$CHANGED" | sed '/^$/d' | grep -v '\.java$' || true)
5051
if [[ -n "$UNEXPECTED" ]]; then
5152
echo "::error::Unexpected files changed:"
5253
echo "$UNEXPECTED"
5354
exit 1
5455
fi
55-
git diff --binary > /tmp/protobuf-sources.patch
56+
git add -A -- '*.java'
57+
git diff --cached --binary > /tmp/protobuf-sources.patch
5658
- name: Upload generated patch
5759
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
5860
with:
@@ -83,11 +85,14 @@ jobs:
8385
echo "No generated changes to commit"
8486
exit 0
8587
fi
86-
git apply "$PATCH"
88+
git apply --index "$PATCH"
89+
if git diff --cached --quiet; then
90+
echo "No generated changes to commit"
91+
exit 0
92+
fi
8793
# Note: GITHUB_TOKEN pushes don't trigger CI re-runs.
8894
# Close and reopen the PR to trigger CI after this commit.
8995
git config user.name "github-actions[bot]"
9096
git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
91-
git add '*.java'
9297
git commit -m "chore: regenerate protobuf sources"
9398
git push

mise.lock

Lines changed: 15 additions & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

mise.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
hugo = "0.163.3"
44
java = "temurin-25.0.3+9.0.LTS"
55
node = "24.18.0"
6-
protoc = "35.0"
6+
protoc = "35.1"
77

88
# Linters
99
actionlint = "1.7.12"

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<properties>
2121
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2222
<automatic.module.name>--module-name-need-to-be-overridden--</automatic.module.name>
23-
<protobuf-java.version>4.35.0</protobuf-java.version>
23+
<protobuf-java.version>4.35.1</protobuf-java.version>
2424
<guava.version>33.6.0-jre</guava.version>
2525
<junit-pioneer.version>2.3.0</junit-pioneer.version>
2626
<awaitility.version>4.3.0</awaitility.version>

0 commit comments

Comments
 (0)