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

chore: remove cl test modules (backport #7254) #7261

Merged
merged 2 commits into from
Jan 8, 2024
Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 8, 2024

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

On branch mergify/bp/v21.x/pr-7254
Your branch is up to date with 'origin/v21.x'.

You are currently cherry-picking commit 29464249.
  (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:   go.work
	deleted:    tests/cl-genesis-positions/README.md
	deleted:    tests/cl-genesis-positions/convert.go
	deleted:    tests/cl-genesis-positions/edit_localosmosis_genesis.go
	deleted:    tests/cl-genesis-positions/get_data.go
	deleted:    tests/cl-genesis-positions/go.mod
	deleted:    tests/cl-genesis-positions/go.sum
	deleted:    tests/cl-genesis-positions/local_accounts.go
	deleted:    tests/cl-genesis-positions/main.go
	deleted:    tests/cl-genesis-positions/types.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by them: tests/cl-go-client/README.md
	deleted by them: tests/cl-go-client/go.mod
	deleted by them: tests/cl-go-client/go.sum
	deleted by them: tests/cl-go-client/main.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

* remove cl test modules

* remove from go work

(cherry picked from commit 2946424)

# Conflicts:
#	tests/cl-go-client/README.md
#	tests/cl-go-client/go.mod
#	tests/cl-go-client/go.sum
#	tests/cl-go-client/main.go
@mergify mergify bot added the conflicts label Jan 8, 2024
@github-actions github-actions bot added the C:docs Improvements or additions to documentation label Jan 8, 2024
@p0mvn p0mvn merged commit 832ff2a into v21.x Jan 8, 2024
1 check passed
@p0mvn p0mvn deleted the mergify/bp/v21.x/pr-7254 branch January 8, 2024 04:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A:automerge C:docs Improvements or additions to documentation conflicts
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants