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

Upgrade deps, fix lint failures (backport #133) #140

Open
wants to merge 1 commit into
base: release/v1.x.x
Choose a base branch
from

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Nov 7, 2024

The docker package upgrades automatically when pulling petri in as a dep which breaks things.

This bumps the dependency and fixes a bunch of lint issues.


This is an automatic backport of pull request #133 done by Mergify.

(cherry picked from commit 5a07fe1)

# Conflicts:
#	core/go.mod
#	core/go.sum
#	core/provider/digitalocean/task.go
#	core/provider/docker/network.go
#	core/provider/docker/task.go
#	core/provider/docker/volume.go
#	cosmos/go.mod
#	cosmos/go.sum
Copy link
Author

mergify bot commented Nov 7, 2024

Cherry-pick of 5a07fe1 has failed:

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

You are currently cherry-picking commit 5a07fe1.
  (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:   cosmos/node/node.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   core/go.mod
	both modified:   core/go.sum
	both modified:   core/provider/digitalocean/task.go
	both modified:   core/provider/docker/network.go
	both modified:   core/provider/docker/task.go
	both modified:   core/provider/docker/volume.go
	both modified:   cosmos/go.mod
	both modified:   cosmos/go.sum

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant