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: upgrades go version to 1.22.5 in main (backport #1434) #1436

Closed

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 29, 2024

Closes #1433


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

Closes #1433

(cherry picked from commit f03f8ec)

# Conflicts:
#	.github/workflows/check-generated.yml
#	.github/workflows/coverage.yml
#	.github/workflows/e2e-manual.yml
#	.github/workflows/e2e-nightly-34x.yml
#	.github/workflows/e2e.yml
#	.github/workflows/fuzz-nightly.yml
#	.github/workflows/govulncheck.yml
#	.github/workflows/pre-release.yml
#	.github/workflows/release-version.yml
#	.github/workflows/release.yml
#	.github/workflows/tests.yml
@mergify mergify bot requested a review from a team as a code owner July 29, 2024 09:57
@mergify mergify bot added the conflicts label Jul 29, 2024
Copy link
Contributor Author

mergify bot commented Jul 29, 2024

Cherry-pick of f03f8ec has failed:

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

You are currently cherry-picking commit f03f8ec17.
  (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:   DOCKER/Dockerfile
	modified:   README.md
	modified:   go.mod
	modified:   scripts/proto-gen.sh
	modified:   test/docker/Dockerfile
	modified:   test/e2e/docker/Dockerfile

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .github/workflows/check-generated.yml
	both modified:   .github/workflows/coverage.yml
	both modified:   .github/workflows/e2e-manual.yml
	both modified:   .github/workflows/e2e-nightly-34x.yml
	both modified:   .github/workflows/e2e.yml
	both modified:   .github/workflows/fuzz-nightly.yml
	both modified:   .github/workflows/govulncheck.yml
	both modified:   .github/workflows/pre-release.yml
	both modified:   .github/workflows/release-version.yml
	both modified:   .github/workflows/release.yml
	both modified:   .github/workflows/tests.yml

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

@mergify mergify bot requested review from staheri14 and evan-forbes and removed request for a team July 29, 2024 09:57
@@ -12,7 +12,11 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-go@v4
with:
<<<<<<< HEAD
Copy link
Member

Choose a reason for hiding this comment

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

pushed without resolving merge conflicts

@rootulp rootulp marked this pull request as draft July 30, 2024 15:39
@rootulp
Copy link
Collaborator

rootulp commented Jul 30, 2024

Can prob close this PR in favor of #1441

@cmwaters cmwaters closed this Aug 1, 2024
@mergify mergify bot deleted the mergify/bp/v0.34.x-celestia/pr-1434 branch August 1, 2024 11:13
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.

Bumping go version to 1.22.5
4 participants