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

Give callbacks its own go.mod (backport #4341) #4464

Merged
merged 5 commits into from
Aug 28, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 25, 2023

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

On branch mergify/bp/release/v7.3.x/pr-4341
Your branch is up to date with 'origin/release/v7.3.x'.

You are currently cherry-picking commit a18159f7.
  (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:   .github/workflows/callbacks.yml
	modified:   modules/apps/callbacks/callbacks_test.go
	modified:   modules/apps/callbacks/fee_transfer_test.go
	new file:   modules/apps/callbacks/go.mod
	new file:   modules/apps/callbacks/go.sum
	modified:   modules/apps/callbacks/ibc_middleware_test.go
	modified:   modules/apps/callbacks/ica_test.go
	modified:   modules/apps/callbacks/testing/simapp/app.go
	modified:   modules/apps/callbacks/testing/simapp/contract_keeper.go
	modified:   modules/apps/callbacks/testing/simapp/encoding.go
	modified:   modules/apps/callbacks/transfer_test.go
	modified:   modules/apps/callbacks/types/callbacks_test.go
	modified:   modules/apps/callbacks/types/events_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   modules/apps/callbacks/export_test.go
	both modified:   modules/apps/callbacks/ibc_middleware.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

(cherry picked from commit a18159f)

# Conflicts:
#	modules/apps/callbacks/export_test.go
#	modules/apps/callbacks/ibc_middleware.go
@srdtrk
Copy link
Member

srdtrk commented Aug 25, 2023

Important note: We still use replace github.com/cosmos/ibc-go/v7 => ../../../ in callbacks mw's go.mod because there are some changes we've added to release/v7.3.x since v7.3.0-rc0 that are required for this integration, namely:

Regardless, a second release candidate is required for the replace statement to be removed. The second release candidate must be tagged after this PR is merged.

@srdtrk srdtrk removed the conflicts label Aug 25, 2023
Comment on lines 12 to 23
lint:
runs-on: ubuntu-latest
steps:
- uses: actions/setup-go@v4
with:
go-version: '1.20'
- uses: actions/checkout@v3
- uses: golangci/golangci-lint-action@v3.7.0
with:
version: v1.53.3
args: --timeout 5m
working-directory: modules/apps/callbacks
Copy link
Contributor

Choose a reason for hiding this comment

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

I added this from #4355.

Copy link
Contributor

Choose a reason for hiding this comment

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

The linter is causing more trouble than anything else, I will take it out.

@crodriguezvega crodriguezvega merged commit 3201ab9 into release/v7.3.x Aug 28, 2023
19 checks passed
@crodriguezvega crodriguezvega deleted the mergify/bp/release/v7.3.x/pr-4341 branch August 28, 2023 11:31
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.

4 participants