Skip to content

chore: bump ibc-go to v10.1.1 (backport #2603)#2604

Merged
vladjdk merged 4 commits intorelease/v7.0.xfrom
mergify/bp/release/v7.0.x/pr-2603
Apr 8, 2025
Merged

chore: bump ibc-go to v10.1.1 (backport #2603)#2604
vladjdk merged 4 commits intorelease/v7.0.xfrom
mergify/bp/release/v7.0.x/pr-2603

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify bot commented Apr 8, 2025

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

@gjermundgaraba @mergify
chore: bump ibc-go to v10.1.1 (#2603)
94065ea 
(cherry picked from commit 06e0dc6)

# Conflicts:
#	tests/interchain/go.mod
@mergify mergify bot requested a review from a team April 8, 2025 21:04
@mergify mergify bot added the conflicts label Apr 8, 2025
@mergify
Copy link
Copy Markdown
Contributor Author

mergify bot commented Apr 8, 2025

Cherry-pick of 06e0dc6 has failed:

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

You are currently cherry-picking commit 06e0dc6.
  (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.mod
	modified:   go.sum
	modified:   tests/integration/setup.go
	modified:   tests/interchain/go.sum
	modified:   tests/mbt/driver/setup.go
	modified:   testutil/ibc_testing/generic_setup.go
	modified:   testutil/ibc_testing/specific_setup.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   tests/interchain/go.mod

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

@github-actions github-actions bot added the C:Testing Assigned automatically by the PR labeler label Apr 8, 2025
gjermundgaraba
gjermundgaraba reviewed Apr 8, 2025
View reviewed changes
@vladjdk vladjdk merged commit 4e3a4ac into release/v7.0.x Apr 8, 2025
16 checks passed
@vladjdk vladjdk deleted the mergify/bp/release/v7.0.x/pr-2603 branch April 8, 2025 22:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@gjermundgaraba gjermundgaraba gjermundgaraba approved these changes

+1 more reviewer

@vladjdk vladjdk vladjdk approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@gjermundgaraba gjermundgaraba

Labels

C:Testing Assigned automatically by the PR labeler conflicts

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@gjermundgaraba @vladjdk