Skip to content

build(deps): Bump minimum Go version to v1.23 (backport #4041)#4086

Merged
andynog merged 3 commits intov1.xfrom
mergify/bp/v1.x/pr-4041
Sep 11, 2024
Merged

build(deps): Bump minimum Go version to v1.23 (backport #4041)#4086
andynog merged 3 commits intov1.xfrom
mergify/bp/v1.x/pr-4041

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Sep 11, 2024

Closes #4039

cometbft-db PR: cometbft/cometbft-db#194


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

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

Closes #4039

cometbft-db PR: cometbft/cometbft-db#194

---

#### PR checklist

- [ ] ~~Tests written/updated~~
- [x] Changelog entry added in `.changelog` (we use
[unclog](https://github.com/informalsystems/unclog) to manage our
changelog)
- [x] Updated relevant documentation (`docs/` or `spec/`) and code
comments

---------

Co-authored-by: Andy Nogueira <me@andynogueira.dev>
(cherry picked from commit ff34f75)

# Conflicts:
#	go.mod
@mergify mergify bot requested a review from a team as a code owner September 11, 2024 21:58
@mergify mergify bot requested a review from a team September 11, 2024 21:58
@mergify mergify bot added the conflicts label Sep 11, 2024
@mergify
Copy link
Contributor Author

mergify bot commented Sep 11, 2024

Cherry-pick of ff34f75 has failed:

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

You are currently cherry-picking commit ff34f757b.
  (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:
	deleted:    .changelog/unreleased/breaking-changes/2725-bump-go-version-1-22.md
	new file:   .changelog/unreleased/breaking-changes/2725-bump-go-version-1-23.md
	modified:   .github/workflows/go-version.env
	modified:   DOCKER/Dockerfile
	modified:   README.md
	modified:   UPGRADING.md
	modified:   api/go.mod
	modified:   docs/tutorials/go-built-in.md
	modified:   docs/tutorials/go.md
	modified:   go.sum
	modified:   go.work
	modified:   internal/blocksync/pool.go
	modified:   internal/consensus/ticker.go
	modified:   internal/consensus/wal_test.go
	modified:   test/docker/Dockerfile
	modified:   test/e2e/docker/Dockerfile
	modified:   test/e2e/docker/Dockerfile.debug

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   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

Copy link
Collaborator

@andynog andynog left a comment

Choose a reason for hiding this comment

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

lgtm, fixed conflicts

@andynog andynog merged commit 787095f into v1.x Sep 11, 2024
@andynog andynog deleted the mergify/bp/v1.x/pr-4041 branch September 11, 2024 22:44
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.

2 participants