Skip to content

Commit 040cf3f

Browse files
authored
Merge pull request #98 from scribd/maksimt/SERF-3131/go-1.22
[SERF-3131] Upgrade go version to 1.22
2 parents f5288dd + 0f008f9 commit 040cf3f

File tree

5 files changed

+18
-16
lines changed

5 files changed

+18
-16
lines changed

.golangci.yml

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,6 @@ run:
22
# timeout for analysis, e.g. 30s, 5m, default is 1m
33
timeout: 2m
44

5-
# which dirs to skip: they won't be analyzed;
6-
# can use regexp here: generated.*, regexp is applied on full path;
7-
# default value is empty list, but next dirs are always skipped independently
8-
# from this option's value:
9-
# vendor$, third_party$, testdata$, examples$, Godeps$, builtin$
10-
skip-dirs:
11-
- configs
12-
135
# by default isn't set. If set we pass it to "go list -mod={option}". From "go help modules":
146
# If invoked with -mod=readonly, the go command is disallowed from the implicit
157
# automatic updating of go.mod described above. Instead, it fails when any changes
@@ -43,7 +35,8 @@ linters-settings:
4335
# default is false: such cases aren't reported by default.
4436
check-blank: true
4537
govet:
46-
check-shadowing: true
38+
enable:
39+
- shadow
4740
lll:
4841
line-length: 120
4942
misspell:
@@ -54,6 +47,14 @@ linters-settings:
5447
check-exported: false
5548

5649
issues:
50+
# Which dirs to exclude: issues from them won't be reported.
51+
# Can use regexp here: `generated.*`, regexp is applied on full path,
52+
# including the path prefix if one is set.
53+
# Default dirs are skipped independently of this option's value (see exclude-dirs-use-default).
54+
# "/" will be replaced by current OS file path separator to properly work on Windows.
55+
# Default: []
56+
exclude-dirs:
57+
- configs
5758
exclude-rules:
5859
# SA1029 – Inappropriate key in call to context.WithValue
5960
# https://staticcheck.io/docs/checks#SA1029

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# build stage
33
# =============================================================================
44

5-
FROM golang:1.21.1-alpine AS builder
5+
FROM golang:1.22.2-alpine AS builder
66

77
WORKDIR /sdk
88

@@ -33,7 +33,7 @@ FROM builder AS linter
3333

3434
# binary will be $(go env GOPATH)/bin/golangci-lint
3535
RUN curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh \
36-
| sh -s -- -b $(go env GOPATH)/bin v1.54.2
36+
| sh -s -- -b $(go env GOPATH)/bin v1.57.2
3737

3838
# install goimports
3939
RUN go install golang.org/x/tools/cmd/[email protected]

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ SDK, the Go version.
5656

5757
## Prerequisites
5858

59-
* [Go](https://golang.org) (version `1.21.1`).
59+
* [Go](https://golang.org) (version `1.22.2`).
6060
* [Docker](https://www.docker.com/) (version `19.03.2`).
6161

6262
## SDK functionality
@@ -1417,7 +1417,7 @@ You can enter the docker environment to build, run and debug your service:
14171417
```
14181418
$ docker-compose run --rm sdk /bin/bash
14191419
root@1f31fa8e5c49:/sdk# go version
1420-
go version go1.21.1 linux/amd64
1420+
go version go1.22.2 linux/amd64
14211421
```
14221422

14231423
Refer to the

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/scribd/go-sdk
22

3-
go 1.21
3+
go 1.22
44

55
require (
66
github.com/DATA-DOG/go-sqlmock v1.5.0
@@ -51,7 +51,7 @@ require (
5151
github.com/klauspost/compress v1.15.9 // indirect
5252
github.com/magiconair/properties v1.8.5 // indirect
5353
github.com/mailru/easyjson v0.7.7 // indirect
54-
github.com/mattn/go-sqlite3 v1.14.15 // indirect
54+
github.com/mattn/go-sqlite3 v1.14.22 // indirect
5555
github.com/mitchellh/mapstructure v1.4.3 // indirect
5656
github.com/pelletier/go-toml v1.9.4 // indirect
5757
github.com/philhofer/fwd v1.1.1 // indirect

go.sum

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,8 +184,9 @@ github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hd
184184
github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ=
185185
github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
186186
github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
187-
github.com/mattn/go-sqlite3 v1.14.15 h1:vfoHhTN1af61xCRSWzFIWzx2YskyMTwHLrExkBOjvxI=
188187
github.com/mattn/go-sqlite3 v1.14.15/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg=
188+
github.com/mattn/go-sqlite3 v1.14.22 h1:2gZY6PC6kBnID23Tichd1K+Z0oS6nE/XwU+Vz/5o4kU=
189+
github.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=
189190
github.com/mattn/goveralls v0.0.2/go.mod h1:8d1ZMHsd7fW6IRPKQh46F2WRpyib5/X4FOpevwGNQEw=
190191
github.com/mediocregopher/radix/v3 v3.4.2/go.mod h1:8FL3F6UQRXHXIBSPUs5h0RybMF8i4n7wVopoX3x7Bv8=
191192
github.com/microcosm-cc/bluemonday v1.0.2/go.mod h1:iVP4YcDBq+n/5fb23BhYFvIMq/leAFZyRl6bYmGDlGc=

0 commit comments

Comments
 (0)