Skip to content

misc(tools)!: remove tools package (backport #2046) (backport #2073)#4075

Merged
mergify[bot] merged 4 commits intov0.38.x-experimentalfrom
mergify/bp/v0.38.x-experimental/pr-2073
Sep 11, 2024
Merged

misc(tools)!: remove tools package (backport #2046) (backport #2073)#4075
mergify[bot] merged 4 commits intov0.38.x-experimentalfrom
mergify/bp/v0.38.x-experimental/pr-2073

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Sep 11, 2024

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

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

You are currently cherry-picking commit 2bbb5c109.
  (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:   scripts/mockery_generate.sh
	deleted:    tools/proto/Dockerfile
	deleted:    tools/tools.go
	modified:   types/params.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   go.mod
	both modified:   go.sum
	deleted by them: tools/README.md

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


This is an automatic backport of pull request #2073 done by [Mergify](https://mergify.com).

This is an automatic backport of pull request #2046 done by
[Mergify](https://mergify.com).
Cherry-pick of 2bbb5c1 has failed:
```
On branch mergify/bp/v0.38.x/pr-2046
Your branch is up to date with 'origin/v0.38.x'.

You are currently cherry-picking commit 2bbb5c1.
  (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:   scripts/mockery_generate.sh
	deleted:    tools/proto/Dockerfile
	deleted:    tools/tools.go
	modified:   types/params.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   go.mod
	both modified:   go.sum
	deleted by them: tools/README.md

```

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

---

<details>
<summary>Mergify commands and options</summary>

<br />

More conditions and actions can be found in the
[documentation](https://docs.mergify.com/).

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](https://dashboard.mergify.com) you
can:

- look at your merge queues
- generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com
</details>

---------

Co-authored-by: Jacob Gadikian <jacobgadikian@gmail.com>
Co-authored-by: Anton Kaliaev <anton.kalyaev@gmail.com>
(cherry picked from commit 418f82e)

# Conflicts:
#	go.mod
#	go.sum
#	state/indexer/mocks/block_indexer.go
#	state/txindex/mocks/tx_indexer.go
@mergify mergify bot requested a review from a team as a code owner September 11, 2024 07:09
@mergify
Copy link
Contributor Author

mergify bot commented Sep 11, 2024

Cherry-pick of 418f82e has failed:

On branch mergify/bp/v0.38.x-experimental/pr-2073
Your branch is up to date with 'origin/v0.38.x-experimental'.

You are currently cherry-picking commit 418f82ecb.
  (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:   abci/client/mocks/client.go
	modified:   abci/types/mocks/application.go
	modified:   evidence/mocks/block_store.go
	modified:   light/rpc/mocks/light_client.go
	modified:   mempool/mocks/mempool.go
	modified:   p2p/mocks/peer.go
	modified:   proxy/mocks/app_conn_consensus.go
	modified:   proxy/mocks/app_conn_mempool.go
	modified:   proxy/mocks/app_conn_query.go
	modified:   proxy/mocks/app_conn_snapshot.go
	modified:   proxy/mocks/client_creator.go
	modified:   scripts/mockery_generate.sh
	modified:   state/mocks/block_store.go
	modified:   state/mocks/evidence_pool.go
	modified:   state/mocks/store.go
	modified:   statesync/mocks/state_provider.go
	deleted:    tools/README.md
	deleted:    tools/proto/Dockerfile
	deleted:    tools/tools.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   go.mod
	both modified:   go.sum
	both modified:   state/indexer/mocks/block_indexer.go
	both modified:   state/txindex/mocks/tx_indexer.go

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 mergify bot added the conflicts label Sep 11, 2024
@mergify mergify bot merged commit 06d18ea into v0.38.x-experimental Sep 11, 2024
@mergify mergify bot deleted the mergify/bp/v0.38.x-experimental/pr-2073 branch September 11, 2024 08:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant