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

Making CI for testing generated proto correctness (backport #1892) #2074

Merged
merged 2 commits into from
Jul 15, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 15, 2022

This is an automatic backport of pull request #1892 done by Mergify.
Cherry-pick of 0956d89 has failed:

On branch mergify/bp/v10.x/pr-1892
Your branch is up to date with 'origin/v10.x'.

You are currently cherry-picking commit 0956d893.
  (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:
	new file:   .github/workflows/check-generated.yml
	new file:   contrib/scripts/check-generated.sh

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   chain.schema.json

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


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

(cherry picked from commit 0956d89)

# Conflicts:
#	chain.schema.json
@mergify mergify bot requested a review from a team July 15, 2022 02:16
@mergify mergify bot added the conflicts label Jul 15, 2022
@p0mvn
Copy link
Member

p0mvn commented Jul 15, 2022

Let's merge this in, I will close / rebase my other PRs

@ValarDragon
Copy link
Member

Thanks! Sorry for the race-condition / overhead there 😅

@ValarDragon ValarDragon merged commit 27b8a8e into v10.x Jul 15, 2022
@ValarDragon ValarDragon deleted the mergify/bp/v10.x/pr-1892 branch July 15, 2022 03:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

3 participants