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

Bump rust-rocksdb to 0.19.0 tag (backport #26949)#27090

Closed
mergify[bot] wants to merge 2 commits intov1.10from
mergify/bp/v1.10/pr-26949
Closed

Bump rust-rocksdb to 0.19.0 tag (backport #26949)#27090
mergify[bot] wants to merge 2 commits intov1.10from
mergify/bp/v1.10/pr-26949

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify Bot commented Aug 11, 2022

This is an automatic backport of pull request #26949 done by Mergify.
Cherry-pick of 14d9922 has failed:

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

You are currently cherry-picking commit 14d992210.
  (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:   ledger/Cargo.toml
	modified:   programs/bpf/Cargo.lock

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   Cargo.lock
	both modified:   ledger/src/blockstore_db.rs

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 14d9922)

# Conflicts:
#	Cargo.lock
#	ledger/src/blockstore_db.rs
@mergify mergify Bot added the conflicts label Aug 11, 2022
@mergify mergify Bot added the automerge Merge this Pull Request automatically once CI passes label Aug 11, 2022
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Aug 11, 2022

automerge label removed due to a CI failure

@mergify mergify Bot removed the automerge Merge this Pull Request automatically once CI passes label Aug 11, 2022
@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 Aug 11, 2022
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Aug 11, 2022

automerge label removed due to a CI failure

@steviez
Copy link
Copy Markdown
Contributor

steviez commented Aug 11, 2022

Abandoning this PR in light of https://discord.com/channels/428295358100013066/560503042458517505/1007332476311588874

Cargo v1.60 added fields to the crate index format, so crates published using those fields can't be found by earlier versions of rust. The last three version of librocksdb-sys have used the new format (and a totally different versioning pattern, incidentally)

@steviez steviez closed this Aug 11, 2022
@mergify mergify Bot deleted the mergify/bp/v1.10/pr-26949 branch August 11, 2022 17:06
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant