Skip to content

Commit

Permalink
build(deps): go 1.23, mockery 2.46.2, golangci-lint 1.61 (#954)
Browse files Browse the repository at this point in the history
* build(deps): Bump github.com/vektra/mockery/v2 from 2.41.0 to 2.46.2

Bumps [github.com/vektra/mockery/v2](https://github.com/vektra/mockery) from 2.41.0 to 2.46.2.
- [Release notes](https://github.com/vektra/mockery/releases)
- [Changelog](https://github.com/vektra/mockery/blob/master/docs/changelog.md)
- [Commits](vektra/mockery@v2.41.0...v2.46.2)

---
updated-dependencies:
- dependency-name: github.com/vektra/mockery/v2
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

* chore: update deps

* build(deps): Upgrade go to 1.23

* chore: trigger workflow

* chore: make mockery

* chore: fix typo

* build(deps): upgrade golangci-lint to 1.61

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
  • Loading branch information
lklimek and dependabot[bot] authored Oct 16, 2024
1 parent 525544e commit f8ebd34
Show file tree
Hide file tree
Showing 21 changed files with 331 additions and 388 deletions.
2 changes: 1 addition & 1 deletion .github/actions/bls/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ runs:
steps:
- uses: actions/setup-go@v2
with:
go-version: "1.22"
go-version: "1.23"
- uses: actions/checkout@v2
with:
submodules: true
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
steps:
- uses: actions/[email protected]
with:
go-version: "1.22"
go-version: "1.23"
- uses: actions/checkout@v4
- uses: technote-space/get-diff-action@v6
with:
Expand Down Expand Up @@ -54,7 +54,7 @@ jobs:
steps:
- uses: actions/[email protected]
with:
go-version: "1.22"
go-version: "1.23"
- uses: actions/checkout@v4
- uses: technote-space/get-diff-action@v6
with:
Expand All @@ -79,7 +79,7 @@ jobs:
steps:
- uses: actions/[email protected]
with:
go-version: "1.22"
go-version: "1.23"
- uses: actions/checkout@v4
- uses: technote-space/get-diff-action@v6
with:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/check-generated.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,15 @@ jobs:
steps:
- uses: actions/[email protected]
with:
go-version: "1.22"
go-version: "1.23"

- uses: actions/checkout@v4

- name: "Check generated mocks"
run: |
set -euo pipefail
readonly MOCKERY=2.41.0 # N.B. no leading "v"
readonly MOCKERY=2.46.2 # N.B. no leading "v"
curl -sL "https://github.com/vektra/mockery/releases/download/v${MOCKERY}/mockery_${MOCKERY}_Linux_x86_64.tar.gz" | tar -C /usr/local/bin -xzf -
make mockery 2>/dev/null
Expand All @@ -49,7 +49,7 @@ jobs:
steps:
- uses: actions/[email protected]
with:
go-version: "1.22"
go-version: "1.23"

- uses: actions/checkout@v4
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
steps:
- uses: actions/[email protected]
with:
go-version: "1.22"
go-version: "1.23"

- name: Set up Docker Buildx
uses: docker/[email protected]
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
submodules: true
- uses: actions/[email protected]
with:
go-version: "^1.22"
go-version: "^1.23"
- uses: technote-space/get-diff-action@v6
with:
PATTERNS: |
Expand All @@ -53,7 +53,7 @@ jobs:
# Required: the version of golangci-lint is required and
# must be specified without patch version: we always use the
# latest patch version.
version: v1.55
version: v1.61
args: --timeout 10m
github-token: ${{ secrets.github_token }}
if: env.GIT_DIFF
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:

- uses: actions/[email protected]
with:
go-version: "1.22"
go-version: "1.23"

- name: Build
uses: goreleaser/goreleaser-action@v6
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
steps:
- uses: actions/[email protected]
with:
go-version: "1.22"
go-version: "1.23"
- uses: actions/checkout@v4
- uses: technote-space/get-diff-action@v6
with:
Expand Down
8 changes: 4 additions & 4 deletions DOCKER/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
# * compile - builds final binaries
# * image - creates final image of minimal size

ARG ALIPNE_VERSION=3.19
ARG GOLANG_VERSION=1.22
ARG ALPINE_VERSION=3.19
ARG GOLANG_VERSION=1.23
#################################
# STAGE 1: install dependencies #
#################################
FROM golang:${GOLANG_VERSION}-alpine${ALIPNE_VERSION} AS base
FROM golang:${GOLANG_VERSION}-alpine${ALPINE_VERSION} AS base

RUN apk update && \
apk upgrade && \
Expand Down Expand Up @@ -55,7 +55,7 @@ RUN rm -r /src/tenderdash/third_party && ln -s /src/bls/third_party /src/tenderd
########################
# STAGE 4: FINAL IMAGE #
########################
FROM alpine:${ALIPNE_VERSION} AS image
FROM alpine:${ALPINE_VERSION} AS image

LABEL maintainer="[email protected]"

Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ format:

lint:
@echo "--> Running linter"
go run github.com/golangci/golangci-lint/cmd/golangci-lint run
go run github.com/golangci/golangci-lint/cmd/golangci-lint@v1.61.0 run
.PHONY: lint

DESTINATION = ./index.html.md
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ requirements if installing from source.

| Requirement | Notes |
|-------------|------------------|
| Go version | Go1.22 or higher |
| Go version | Go1.23 or higher |

## Versioning

Expand Down
4 changes: 2 additions & 2 deletions docs/tutorials/go-built-in.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ Verify that you have the latest version of Go installed:

```sh
$ go version
go version go1.22.x darwin/amd64
go version go1.23.x darwin/amd64
```

Note that the exact patch number may differ as Go releases come out.
Expand Down Expand Up @@ -596,7 +596,7 @@ This will populate the `go.mod` with a release number followed by a hash for Ten
```go
module github.com/<username>/kvstore
go 1.22
go 1.23
require (
github.com/dgraph-io/badger/v3 v3.2103.2
Expand Down
2 changes: 1 addition & 1 deletion docs/tutorials/go.md
Original file line number Diff line number Diff line change
Expand Up @@ -454,7 +454,7 @@ This will populate the `go.mod` with a release number followed by a hash for Ten
```go
module github.com/<username>/kvstore

go 1.22
go 1.23

require (
github.com/dgraph-io/badger/v3 v3.2103.2
Expand Down
Loading

0 comments on commit f8ebd34

Please sign in to comment.