Skip to content

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 10, 2025

Bumps google.golang.org/protobuf from 1.36.8 to 1.36.9.

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 #5481 done by [Mergify](https://mergify.com).

…5481)

* build(deps): bump google.golang.org/protobuf from 1.36.8 to 1.36.9

Bumps google.golang.org/protobuf from 1.36.8 to 1.36.9.

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

Signed-off-by: dependabot[bot] <[email protected]>

* Post dependabot file modifications

---------

Signed-off-by: dependabot[bot] <[email protected]>
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 0865fb1)

# Conflicts:
#	NOTICE-fips.txt
#	testing/go.mod
@mergify mergify bot requested a review from a team as a code owner September 10, 2025 09:00
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Sep 10, 2025
Copy link
Contributor Author

mergify bot commented Sep 10, 2025

Cherry-pick of 0865fb1 has failed:

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

You are currently cherry-picking commit 0865fb1.
  (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)

Changes to be committed:
	modified:   NOTICE.txt
	modified:   go.mod
	modified:   go.sum
	modified:   testing/go.sum

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   NOTICE-fips.txt
	both modified:   testing/go.mod

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

@mergify mergify bot requested review from michel-laterman and pchila September 10, 2025 09:00
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Sep 10, 2025
@github-actions github-actions bot added automation dependency Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team labels Sep 10, 2025
@prodsecmachine
Copy link

prodsecmachine commented Sep 10, 2025

🎉 Snyk checks have passed. No issues have been found so far.

security/snyk check is complete. No issues have been found. (View Details)

license/snyk check is complete. No issues have been found. (View Details)

@pchila pchila self-assigned this Sep 12, 2025
Copy link
Contributor Author

mergify bot commented Sep 12, 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/9.0/pr-5481 upstream/mergify/bp/9.0/pr-5481
git merge upstream/9.0
git push upstream mergify/bp/9.0/pr-5481

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

@pchila pchila merged commit 2c54007 into 9.0 Sep 12, 2025
9 checks passed
@pchila pchila deleted the mergify/bp/9.0/pr-5481 branch September 12, 2025 09:59
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