Skip to content

v0.34.x: rename TMHOME to CMTHOME (backport #212)#227

Merged
jmalicevic merged 17 commits intov0.34.xfrom
mergify/bp/v0.34.x/pr-212
Jan 31, 2023
Merged

v0.34.x: rename TMHOME to CMTHOME (backport #212)#227
jmalicevic merged 17 commits intov0.34.xfrom
mergify/bp/v0.34.x/pr-212

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Jan 27, 2023

This is an automatic backport of pull request #212 done by Mergify.
Cherry-pick of 2f4a09a has failed:

On branch mergify/bp/v0.34.x/pr-212
Your branch is up to date with 'origin/v0.34.x'.

You are currently cherry-picking commit 2f4a09a39.
  (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:   .changelog/unreleased/breaking-changes/211-deprecate-tmhome.md
	modified:   DOCKER/Dockerfile
	modified:   DOCKER/docker-entrypoint.sh
	modified:   Makefile
	renamed:    cmd/tendermint/commands/compact.go -> cmd/cometbft/commands/compact.go
	renamed:    cmd/tendermint/commands/debug/debug.go -> cmd/cometbft/commands/debug/debug.go
	renamed:    cmd/tendermint/commands/debug/dump.go -> cmd/cometbft/commands/debug/dump.go
	renamed:    cmd/tendermint/commands/debug/io.go -> cmd/cometbft/commands/debug/io.go
	renamed:    cmd/tendermint/commands/debug/kill.go -> cmd/cometbft/commands/debug/kill.go
	renamed:    cmd/tendermint/commands/debug/util.go -> cmd/cometbft/commands/debug/util.go
	renamed:    cmd/tendermint/commands/gen_node_key.go -> cmd/cometbft/commands/gen_node_key.go
	renamed:    cmd/tendermint/commands/gen_validator.go -> cmd/cometbft/commands/gen_validator.go
	renamed:    cmd/tendermint/commands/init.go -> cmd/cometbft/commands/init.go
	renamed:    cmd/tendermint/commands/light.go -> cmd/cometbft/commands/light.go
	renamed:    cmd/tendermint/commands/probe_upnp.go -> cmd/cometbft/commands/probe_upnp.go
	renamed:    cmd/tendermint/commands/reindex_event.go -> cmd/cometbft/commands/reindex_event.go
	renamed:    cmd/tendermint/commands/reindex_event_test.go -> cmd/cometbft/commands/reindex_event_test.go
	renamed:    cmd/tendermint/commands/replay.go -> cmd/cometbft/commands/replay.go
	renamed:    cmd/tendermint/commands/reset.go -> cmd/cometbft/commands/reset.go
	renamed:    cmd/tendermint/commands/reset_test.go -> cmd/cometbft/commands/reset_test.go
	renamed:    cmd/tendermint/commands/rollback.go -> cmd/cometbft/commands/rollback.go
	renamed:    cmd/tendermint/commands/root.go -> cmd/cometbft/commands/root.go
	renamed:    cmd/tendermint/commands/root_test.go -> cmd/cometbft/commands/root_test.go
	renamed:    cmd/tendermint/commands/run_node.go -> cmd/cometbft/commands/run_node.go
	renamed:    cmd/tendermint/commands/show_node_id.go -> cmd/cometbft/commands/show_node_id.go
	renamed:    cmd/tendermint/commands/show_validator.go -> cmd/cometbft/commands/show_validator.go
	renamed:    cmd/tendermint/commands/testnet.go -> cmd/cometbft/commands/testnet.go
	renamed:    cmd/tendermint/commands/version.go -> cmd/cometbft/commands/version.go
	renamed:    cmd/tendermint/main.go -> cmd/cometbft/main.go
	modified:   config/toml.go
	modified:   docs/tendermint-core/configuration.md
	modified:   docs/tendermint-core/running-in-production.md
	modified:   docs/tendermint-core/using-tendermint.md
	modified:   networks/local/localnode/wrapper.sh
	modified:   rpc/openapi/openapi.yaml
	modified:   test/app/clean.sh
	modified:   test/app/test.sh
	modified:   test/e2e/README.md
	modified:   test/e2e/docker/Dockerfile
	modified:   test/e2e/node/main.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   .gitignore
	deleted by us:   cmd/cometbft/commands/inspect.go
	both modified:   config/config.go

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

@lasarojc @mergify
main: rename TMHOME to CMTHOME (#212)
3f95ea1 
* Renames cmd/tendermint to cmd/cometbft

* Replacing TMHOME for CMTHOME. On reading the environment variable we still try TMHOME if CMTHOME is not found. TMHOME is deprecated and will be removed in the future releases.

* Include TMHOME deprecation in the changelog

* Updating the config

* updating uses of .tendermint to .cometbft

* Updating the Makefile

* Fix test of debug level flags.

* Update .changelog/unreleased/breaking-changes/211-deprecate-tmhome.md

Co-authored-by: Thane Thomson <connect@thanethomson.com>

---------

Co-authored-by: Thane Thomson <connect@thanethomson.com>
(cherry picked from commit 2f4a09a)

# Conflicts:
#	.gitignore
#	cmd/cometbft/commands/inspect.go
#	config/config.go
@mergify mergify bot requested a review from a team as a code owner January 27, 2023 18:03
@mergify mergify bot added the conflicts label Jan 27, 2023
@thanethomson thanethomson changed the title main: rename TMHOME to CMTHOME (backport #212) v0.34.x: rename TMHOME to CMTHOME (backport #212) Jan 27, 2023
@jmalicevic
Copy link
Collaborator

jmalicevic commented Jan 30, 2023

Add fix from #237 .

@jmalicevic jmalicevic self-assigned this Jan 31, 2023
jmalicevic and others added 13 commits January 31, 2023 11:05
@jmalicevic
Revert "main: rename TMHOME to CMTHOME (#212)"
5e5728f 
This reverts commit 3f95ea1.
@lasarojc @thanethomson @jmalicevic
main: rename TMHOME to CMTHOME (#212)
994a72e 
* Renames cmd/tendermint to cmd/cometbft

* Replacing TMHOME for CMTHOME. On reading the environment variable we still try TMHOME if CMTHOME is not found. TMHOME is deprecated and will be removed in the future releases.

* Include TMHOME deprecation in the changelog

* Updating the config

* updating uses of .tendermint to .cometbft

* Updating the Makefile

* Fix test of debug level flags.

* Update .changelog/unreleased/breaking-changes/211-deprecate-tmhome.md

Co-authored-by: Thane Thomson <connect@thanethomson.com>

---------

Co-authored-by: Thane Thomson <connect@thanethomson.com>
@jmalicevic
added uncommited changes
dab1d83
@jmalicevic
Removed inspect.go
9225d98
@jmalicevic
Added env variable fix
d4a69bd
@jmalicevic
Renamed tm command
317dedb
@jmalicevic
Renaming tmhome
69eb302
@jmalicevic
Fixed duplicates and extras in .gitignore and moved defaultdir back t…
6bab204 
…o vars
@jmalicevic
removed non existing folder form .gitignore
37062c8
@jmalicevic
Merge branch 'v0.34.x' into mergify/bp/v0.34.x/pr-212
fd6eba8
@jmalicevic
Merge branch 'v0.34.x' into mergify/bp/v0.34.x/pr-212
a0e3fb0
@jmalicevic
Corrected .gitignore
8704892
@jmalicevic
Merge branch 'v0.34.x' into mergify/bp/v0.34.x/pr-212
bf6c6ac
jmalicevic
jmalicevic reviewed Jan 31, 2023
View reviewed changes
@jmalicevic
Copy link
Collaborator

jmalicevic commented Jan 31, 2023

@sergio-mena .gitignore now contains only backport additions.

sergio-mena
sergio-mena approved these changes Jan 31, 2023
View reviewed changes
Copy link
Collaborator

@sergio-mena sergio-mena left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jmalicevic thanks a lot for your patience!

@jmalicevic jmalicevic merged commit d41a46e into v0.34.x Jan 31, 2023
@jmalicevic jmalicevic deleted the mergify/bp/v0.34.x/pr-212 branch January 31, 2023 21:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

2 more reviewers

@jmalicevic jmalicevic jmalicevic left review comments

@sergio-mena sergio-mena sergio-mena approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@jmalicevic jmalicevic

Labels

conflicts

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@jmalicevic @sergio-mena @lasarojc