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: bump our fork of the sdk to v1.18.1-sdk-v0.46.14 (backport #2589) #2592

Merged
merged 5 commits into from
Oct 4, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 28, 2023

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

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

You are currently cherry-picking commit c6f949b.
  (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

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   go.sum

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

## Overview

minor dep bump

(cherry picked from commit c6f949b)

# Conflicts:
#	go.sum
@mergify mergify bot added the conflicts label Sep 28, 2023
@celestia-bot celestia-bot requested a review from a team September 28, 2023 13:41
@github-actions github-actions bot added the bot item was created by a bot label Sep 28, 2023
@evan-forbes evan-forbes enabled auto-merge (squash) September 28, 2023 13:51
evan-forbes
evan-forbes previously approved these changes Sep 28, 2023
@codecov-commenter
Copy link

codecov-commenter commented Sep 28, 2023

Codecov Report

Merging #2592 (267d385) into v1.x (6b70976) will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##             v1.x    #2592   +/-   ##
=======================================
  Coverage   20.41%   20.41%           
=======================================
  Files         140      140           
  Lines       15934    15934           
=======================================
  Hits         3253     3253           
  Misses      12373    12373           
  Partials      308      308           

@celestia-bot celestia-bot requested a review from a team September 28, 2023 16:11
@evan-forbes evan-forbes merged commit 9791d95 into v1.x Oct 4, 2023
23 checks passed
@evan-forbes evan-forbes deleted the mergify/bp/v1.x/pr-2589 branch October 4, 2023 14:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bot item was created by a bot
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants