Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[8.18](backport #4683) build(deps): bump google.golang.org/protobuf from 1.33.0 to 1.36.6 #4703

Open
wants to merge 3 commits into
base: 8.18
Choose a base branch
from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 26, 2025

Bumps google.golang.org/protobuf from 1.33.0 to 1.36.6.

Dependabot compatibility score

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting @dependabot rebase.


Dependabot commands and options

You can trigger Dependabot actions by commenting on this PR:

  • @dependabot rebase will rebase this PR
  • @dependabot recreate will recreate this PR, overwriting any edits that have been made to it
  • @dependabot merge will merge this PR after your CI passes on it
  • @dependabot squash and merge will squash and merge this PR after your CI passes on it
  • @dependabot cancel merge will cancel a previously requested merge and block automerging
  • @dependabot reopen will reopen this PR if it is closed
  • @dependabot close will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
  • @dependabot show <dependency name> ignore conditions will show all of the ignore conditions of the specified dependency
  • @dependabot ignore this major version will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this minor version will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this dependency will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)

This is an automatic backport of pull request #4683 done by [Mergify](https://mergify.com).

…4683)

* build(deps): bump google.golang.org/protobuf from 1.33.0 to 1.36.6

Bumps google.golang.org/protobuf from 1.33.0 to 1.36.6.

---
updated-dependencies:
- dependency-name: google.golang.org/protobuf
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Post dependabot file modifications

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <dependabot[bot]@users.noreply.github.com>
(cherry picked from commit 93c6b86)

# Conflicts:
#	NOTICE.txt
#	go.mod
#	go.sum
#	testing/go.mod
#	testing/go.sum
@mergify mergify bot requested a review from a team as a code owner March 26, 2025 19:42
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Mar 26, 2025
@mergify mergify bot requested review from ycombinator and kaanyalti March 26, 2025 19:42
Copy link
Contributor Author

mergify bot commented Mar 26, 2025

Cherry-pick of 93c6b86 has failed:

On branch mergify/bp/8.18/pr-4683
Your branch is up to date with 'origin/8.18'.

You are currently cherry-picking commit 93c6b86.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   NOTICE.txt
	both modified:   go.mod
	both modified:   go.sum
	both modified:   testing/go.mod
	both modified:   testing/go.sum

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@github-actions github-actions bot added automation dependency Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team labels Mar 26, 2025
@ycombinator ycombinator enabled auto-merge (squash) March 26, 2025 19:45
Copy link

Quality Gate passed Quality Gate passed

Issues
0 New issues
0 Fixed issues
0 Accepted issues

Measures
0 Security Hotspots
No data about Coverage
No data about Duplication

See analysis details on SonarQube

Copy link
Contributor Author

mergify bot commented Mar 31, 2025

This pull request is now in conflicts. Could you fix it @mergify[bot]? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b mergify/bp/8.18/pr-4683 upstream/mergify/bp/8.18/pr-4683
git merge upstream/8.18
git push upstream mergify/bp/8.18/pr-4683

@ebeahan
Copy link
Member

ebeahan commented Apr 4, 2025

@dependabot rebase

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
automation backport conflicts There is a conflict in the backported pull request dependency Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants