Skip to content

chore: update Go version to v1.22.0 (new MSRV for v1.x and main) (backport #2285)#2768

Merged
melekes merged 2 commits intov1.xfrom
mergify/bp/v1.x/pr-2285
Apr 10, 2024
Merged

chore: update Go version to v1.22.0 (new MSRV for v1.x and main) (backport #2285)#2768
melekes merged 2 commits intov1.xfrom
mergify/bp/v1.x/pr-2285

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Apr 10, 2024

close: #2726

This PR updates go to v1.22.0


PR checklist

  • Tests written/updated
  • Changelog entry added in .changelog (we use unclog to manage our changelog)
  • Updated relevant documentation (docs/ or spec/) and code comments
  • Title follows the Conventional Commits spec

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

…2285)

close: #2726

This PR updates go to v1.22.0

---

#### PR checklist

- [ ] Tests written/updated
- [ ] Changelog entry added in `.changelog` (we use
[unclog](https://github.com/informalsystems/unclog) to manage our
changelog)
- [ ] Updated relevant documentation (`docs/` or `spec/`) and code
comments
- [ ] Title follows the [Conventional
Commits](https://www.conventionalcommits.org/en/v1.0.0/) spec

---------

Co-authored-by: Sergio Mena <sergio@informal.systems>
Co-authored-by: Anton Kaliaev <anton.kalyaev@gmail.com>
Co-authored-by: Andy Nogueira <me@andynogueira.dev>
(cherry picked from commit 15eb404)

# Conflicts:
#	.github/workflows/e2e-nightly-1x.yml
@mergify mergify bot requested a review from a team as a code owner April 10, 2024 10:53
@mergify mergify bot requested a review from a team April 10, 2024 10:53
@mergify mergify bot added the conflicts label Apr 10, 2024
@mergify
Copy link
Contributor Author

mergify bot commented Apr 10, 2024

Cherry-pick of 15eb404 has failed:

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

You are currently cherry-picking commit 15eb404c6.
  (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:   .github/workflows/build.yml
	modified:   .github/workflows/check-generated.yml
	modified:   .github/workflows/e2e-long-main.yml
	modified:   .github/workflows/e2e-manual-multiversion.yml
	modified:   .github/workflows/e2e-manual.yml
	modified:   .github/workflows/e2e-nightly-37x.yml
	modified:   .github/workflows/e2e-nightly-38x.yml
	modified:   .github/workflows/e2e-nightly-main.yml
	modified:   .github/workflows/e2e.yml
	modified:   .github/workflows/fuzz-nightly.yml
	modified:   .github/workflows/govulncheck.yml
	modified:   .github/workflows/lint.yml
	modified:   .github/workflows/pre-release.yml
	modified:   .github/workflows/release-version.yml
	modified:   .github/workflows/release.yml
	modified:   .github/workflows/tests.yml
	modified:   DOCKER/Dockerfile
	modified:   README.md
	modified:   api/go.mod
	modified:   api/go.sum
	modified:   docs/tutorials/go-built-in.md
	modified:   docs/tutorials/go.md
	modified:   go.mod
	modified:   go.sum
	modified:   go.work
	modified:   scripts/mockery_generate.sh
	modified:   test/docker/Dockerfile
	modified:   test/e2e/docker/Dockerfile

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   .github/workflows/e2e-nightly-1x.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

@melekes melekes merged commit 3f195b9 into v1.x Apr 10, 2024
@melekes melekes deleted the mergify/bp/v1.x/pr-2285 branch April 10, 2024 11:12
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.

3 participants