Skip to content

e2e: test runner generates loadtime formatted transactions. (backport #9779)#9800

Merged
williambanfield merged 2 commits intov0.34.xfrom
mergify/bp/v0.34.x/pr-9779
Dec 1, 2022
Merged

e2e: test runner generates loadtime formatted transactions. (backport #9779)#9800
williambanfield merged 2 commits intov0.34.xfrom
mergify/bp/v0.34.x/pr-9779

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Nov 30, 2022

This is an automatic backport of pull request #9779 done by Mergify.
Cherry-pick of 21b2801 has failed:

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

You are currently cherry-picking commit 21b2801c6.
  (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:   test/e2e/networks/simple.toml
	modified:   test/e2e/runner/load.go
	modified:   test/e2e/runner/main.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   test/e2e/pkg/manifest.go
	both modified:   test/e2e/pkg/testnet.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

@williambanfield @mergify
e2e: test runner generates loadtime formatted transactions. (#9779)
379a23f 
(cherry picked from commit 21b2801)

# Conflicts:
#	test/e2e/pkg/manifest.go
#	test/e2e/pkg/testnet.go
@mergify mergify bot requested a review from ebuchman as a code owner November 30, 2022 18:36
@mergify mergify bot requested a review from a team November 30, 2022 18:36
@mergify mergify bot requested review from adizere and lasarojc as code owners November 30, 2022 18:36
@mergify mergify bot added the conflicts label Nov 30, 2022
@thanethomson
Copy link
Contributor

thanethomson commented Nov 30, 2022 •
edited
Loading

@williambanfield any idea why the linter's failing on totally unrelated files here?

The workflow uses golangci-lint v1.50.1: https://github.com/tendermint/tendermint/actions/runs/3586707684/workflow

When running make lint locally on the v0.34.x branch and on this branch, also using golangci-lint v1.50.1, it passes just fine 🤷‍♂️

@williambanfield
Copy link
Contributor

williambanfield commented Dec 1, 2022

@williambanfield any idea why the linter's failing on totally unrelated files here?

The workflow uses golangci-lint v1.50.1: https://github.com/tendermint/tendermint/actions/runs/3586707684/workflow

When running make lint locally on the v0.34.x branch and on this branch, also using golangci-lint v1.50.1, it passes just fine man_shrugging

I ran it as well and I'm a bit stumped. I'll give it another look but it definitely does not reproduce locally.

@williambanfield williambanfield merged commit e7a53ba into v0.34.x Dec 1, 2022
@williambanfield williambanfield deleted the mergify/bp/v0.34.x/pr-9779 branch December 1, 2022 17:23
@moul moul mentioned this pull request Mar 6, 2025
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ebuchman ebuchman Awaiting requested review from ebuchman

@adizere adizere Awaiting requested review from adizere

@lasarojc lasarojc Awaiting requested review from lasarojc

1 more reviewer

@williambanfield williambanfield williambanfield approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

conflicts

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@thanethomson @williambanfield