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

v1.17: [anza migration] rename crates (backport of #10) #15

Closed
wants to merge 2 commits into from

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Feb 22, 2024

This is an automatic backport of pull request #10 done by Mergify.
Cherry-pick of e1e36d2 has failed:

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

You are currently cherry-picking commit e1e36d2fea.
  (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:   .github/scripts/downstream-project-spl-common.sh
	modified:   .github/workflows/release-artifacts.yml
	modified:   ci/localnet-sanity.sh
	modified:   ci/publish-installer.sh
	modified:   ci/publish-tarball.sh
	modified:   ci/run-sanity.sh
	modified:   docs/src/cli/install-solana-cli-tools.md
	modified:   docs/src/cluster/bench-tps.md
	modified:   docs/src/clusters.md
	modified:   docs/src/developing/backwards-compatibility.md
	modified:   docs/src/developing/plugins/geyser-plugins.md
	modified:   docs/src/implemented-proposals/installer.md
	modified:   docs/src/running-validator/restart-cluster.md
	modified:   docs/src/running-validator/validator-failover.md
	modified:   docs/src/validator/best-practices/monitoring.md
	modified:   docs/src/validator/get-started/setup-an-rpc-node.md
	modified:   geyser-plugin-interface/Cargo.toml
	modified:   geyser-plugin-manager/src/accounts_update_notifier.rs
	modified:   geyser-plugin-manager/src/geyser_plugin_manager.rs
	modified:   geyser-plugin-manager/src/slot_status_notifier.rs
	modified:   geyser-plugin-manager/src/transaction_notifier.rs
	modified:   install/Cargo.toml
	renamed:    install/solana-install-init.sh -> install/agave-install-init.sh
	modified:   install/install-help.sh
	renamed:    install/src/bin/solana-install-init.rs -> install/src/bin/agave-install-init.rs
	modified:   install/src/command.rs
	modified:   install/src/lib.rs
	modified:   install/src/main.rs
	modified:   ledger-tool/Cargo.toml
	modified:   ledger-tool/src/ledger_utils.rs
	modified:   local-cluster/tests/local_cluster.rs
	modified:   multinode-demo/bootstrap-validator.sh
	modified:   multinode-demo/common.sh
	modified:   multinode-demo/validator.sh
	modified:   net/net.sh
	modified:   net/remote/remote-deploy-update.sh
	modified:   net/remote/remote-node.sh
	modified:   net/remote/remote-sanity.sh
	modified:   notifier/src/lib.rs
	modified:   programs/sbf/rust/simulation/Cargo.toml
	modified:   programs/sbf/rust/simulation/tests/validator.rs
	modified:   pubsub-client/src/nonblocking/pubsub_client.rs
	modified:   pubsub-client/src/pubsub_client.rs
	modified:   rbpf-cli/src/main.rs
	modified:   rpc/src/rpc.rs
	renamed:    scripts/solana-install-deploy.sh -> scripts/agave-install-deploy.sh
	modified:   scripts/cargo-install-all.sh
	modified:   scripts/run.sh
	modified:   system-test/abi-testcases/mixed-validator-test.sh
	modified:   system-test/stability-testcases/gossip-dos-test.sh
	modified:   validator/Cargo.toml
	modified:   validator/src/bin/solana-test-validator.rs
	modified:   validator/src/bootstrap.rs
	modified:   validator/src/main.rs
	modified:   watchtower/Cargo.toml
	modified:   watchtower/README.md
	modified:   watchtower/src/main.rs

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   Cargo.lock
	both modified:   Cargo.toml
	deleted by us:   cargo-registry/Cargo.toml
	both modified:   docs/src/implemented-proposals/rpc-transaction-history.md
	deleted by us:   docs/src/operations/best-practices/general.md
	both modified:   docs/src/running-validator/validator-start.md
	both modified:   docs/src/running-validator/vote-accounts.md
	both modified:   docs/src/validator/get-started/setup-a-validator.md
	both modified:   geyser-plugin-interface/src/geyser_plugin_interface.rs
	both modified:   geyser-plugin-manager/Cargo.toml
	both modified:   geyser-plugin-manager/src/block_metadata_notifier.rs
	both modified:   geyser-plugin-manager/src/entry_notifier.rs
	deleted by us:   ledger-tool/src/blockstore.rs
	both modified:   ledger/src/blockstore_db.rs
	both modified:   programs/sbf/Cargo.lock
	both modified:   programs/sbf/Cargo.toml
	both modified:   scripts/check-dev-context-only-utils.sh

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


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

* rename geyser-plugin-interface

* rename cargo registry

* rename watchtower

* rename ledger tool

* rename validator

* rename install

* rename geyser plugin interface when patch

(cherry picked from commit e1e36d2)

# Conflicts:
#	Cargo.lock
#	Cargo.toml
#	cargo-registry/Cargo.toml
#	docs/src/implemented-proposals/rpc-transaction-history.md
#	docs/src/operations/best-practices/general.md
#	docs/src/running-validator/validator-start.md
#	docs/src/running-validator/vote-accounts.md
#	docs/src/validator/get-started/setup-a-validator.md
#	geyser-plugin-interface/src/geyser_plugin_interface.rs
#	geyser-plugin-manager/Cargo.toml
#	geyser-plugin-manager/src/block_metadata_notifier.rs
#	geyser-plugin-manager/src/entry_notifier.rs
#	ledger-tool/src/blockstore.rs
#	ledger/src/blockstore_db.rs
#	programs/sbf/Cargo.lock
#	programs/sbf/Cargo.toml
#	scripts/check-dev-context-only-utils.sh
@mergify mergify bot added the conflicts label Feb 22, 2024
@mergify mergify bot assigned yihau Feb 22, 2024
@yihau yihau removed the conflicts label Feb 22, 2024
@yihau yihau closed this Feb 22, 2024
@yihau yihau deleted the mergify/bp/v1.17/pr-10 branch February 22, 2024 16:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant