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

chore: bump buf build (backport #4002) #4230

Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 2, 2024

Description

  • bump buf build to v1.34.0;
  • fix integration test for plugins. The new buf is breaking the tests;
  • fix the golden compare method parameters;
    This is an automatic backport of pull request chore: bump buf build #4002 done by Mergify.

* bump buf build

* fix golden files for apps tests

* add changelog

---------

Co-authored-by: Pantani <Pantani>
(cherry picked from commit 5c9966d)

# Conflicts:
#	go.mod
#	go.sum
@mergify mergify bot requested a review from ilgooz as a code owner July 2, 2024 13:32
@mergify mergify bot added the conflicts label Jul 2, 2024
Copy link
Contributor Author

mergify bot commented Jul 2, 2024

Cherry-pick of 5c9966d has failed:

On branch mergify/bp/release/v28.x.y/pr-4002
Your branch is up to date with 'origin/release/v28.x.y'.

You are currently cherry-picking commit 5c9966d4.
  (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:   changelog.md
	modified:   integration/doctor/testdata/config-need-migrate.txt
	modified:   integration/doctor/testdata/existing-tools.go.txt
	modified:   integration/doctor/testdata/missing-tools.go.txt

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

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 component:ci CI/CD workflow and automated jobs. component:configs labels Jul 2, 2024
@Pantani Pantani enabled auto-merge (squash) July 2, 2024 14:14
@Pantani Pantani changed the base branch from release/v28.x.y to mergify/bp/release/v28.x.y/pr-4001 July 3, 2024 12:17
@Pantani Pantani merged commit 380d1c8 into mergify/bp/release/v28.x.y/pr-4001 Jul 3, 2024
5 of 9 checks passed
@Pantani Pantani deleted the mergify/bp/release/v28.x.y/pr-4002 branch July 3, 2024 12:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant