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

Add cli-output helpers (backport #18933) #18935

Merged
merged 2 commits into from
Jul 28, 2021
Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 28, 2021

This is an automatic backport of pull request #18933 done by Mergify.
Cherry-pick of 467c18e has failed:

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

You are currently cherry-picking commit 467c18e0d.
  (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:   cli-output/Cargo.toml
	modified:   cli-output/src/cli_output.rs
	modified:   cli/src/main.rs
	modified:   ledger-tool/src/bigtable.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   Cargo.lock
	both modified:   programs/bpf/Cargo.lock

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/

* Add OutputFormat helper to reduce copy-pasta

* Add CliSignOnlyData constructor

(cherry picked from commit 467c18e)

# Conflicts:
#	Cargo.lock
#	programs/bpf/Cargo.lock
@mergify mergify bot added conflicts automerge Merge this Pull Request automatically once CI passes labels Jul 28, 2021
@mergify
Copy link
Contributor Author

mergify bot commented Jul 28, 2021

automerge label removed due to a CI failure

@mergify mergify bot removed the automerge Merge this Pull Request automatically once CI passes label Jul 28, 2021
@mergify mergify bot added automerge Merge this Pull Request automatically once CI passes and removed automerge Merge this Pull Request automatically once CI passes labels Jul 28, 2021
@mergify
Copy link
Contributor Author

mergify bot commented Jul 28, 2021

automerge label removed due to a CI failure

@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Jul 28, 2021
@codecov
Copy link

codecov bot commented Jul 28, 2021

Codecov Report

Merging #18935 (4ee096b) into v1.7 (49b0d17) will increase coverage by 0.0%.
The diff coverage is 95.3%.

@@           Coverage Diff           @@
##             v1.7   #18935   +/-   ##
=======================================
  Coverage    82.3%    82.3%           
=======================================
  Files         434      434           
  Lines      122785   122845   +60     
=======================================
+ Hits       101084   101140   +56     
- Misses      21701    21705    +4     

@mergify mergify bot merged commit 02c5093 into v1.7 Jul 28, 2021
@mergify mergify bot deleted the mergify/bp/v1.7/pr-18933 branch July 28, 2021 15:26
@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