Skip to content
This repository has been archived by the owner on Jan 13, 2025. It is now read-only.

Bump prost, prost-types, and tonic (backport #18537) #18557

Merged
merged 2 commits into from
Jul 9, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 9, 2021

This is an automatic backport of pull request #18537 done by Mergify.
Cherry-pick of 761de8b has failed:

On branch mergify/bp/v1.6/pr-18537
Your branch is up to date with 'origin/v1.6'.

You are currently cherry-picking commit 761de8b1a.
  (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:   ci/do-audit.sh
	modified:   ledger/Cargo.toml
	modified:   storage-bigtable/build-proto/Cargo.lock
	modified:   storage-bigtable/build-proto/Cargo.toml
	modified:   storage-bigtable/proto/google.bigtable.v2.rs
	modified:   storage-bigtable/src/bigtable.rs
	modified:   storage-proto/build-proto/Cargo.lock
	modified:   storage-proto/build-proto/Cargo.toml
	modified:   storage-proto/src/transaction_by_addr.proto

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   Cargo.lock
	both modified:   storage-bigtable/Cargo.toml
	both modified:   storage-proto/Cargo.toml

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.io/

* Bump prost+tonic and accommodate generated service changes

* Unignore advisory

* Fixup .proto error list

(cherry picked from commit 761de8b)

# Conflicts:
#	Cargo.lock
#	storage-bigtable/Cargo.toml
#	storage-proto/Cargo.toml
@mergify mergify bot added the conflicts label Jul 9, 2021
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Jul 9, 2021
@codecov
Copy link

codecov bot commented Jul 9, 2021

Codecov Report

Merging #18557 (1edd073) into v1.6 (a9d6b90) will decrease coverage by 0.0%.
The diff coverage is 0.0%.

@@            Coverage Diff            @@
##             v1.6   #18557     +/-   ##
=========================================
- Coverage    82.3%    82.3%   -0.1%     
=========================================
  Files         423      423             
  Lines      117721   117718      -3     
=========================================
- Hits        96906    96901      -5     
- Misses      20815    20817      +2     

@mergify mergify bot merged commit a53fe7b into v1.6 Jul 9, 2021
@mergify mergify bot deleted the mergify/bp/v1.6/pr-18537 branch July 9, 2021 19:38
@brooksprumo brooksprumo mentioned this pull request Aug 23, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
automerge Merge this Pull Request automatically once CI passes conflicts
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant