Skip to content

Commit

Permalink
Merge pull request #98 from scribd/maksimt/SERF-3131/go-1.22
Browse files Browse the repository at this point in the history
[SERF-3131] Upgrade go version to 1.22
  • Loading branch information
Neurostep authored Apr 8, 2024
2 parents f5288dd + 0f008f9 commit 040cf3f
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 16 deletions.
19 changes: 10 additions & 9 deletions .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,6 @@ run:
# timeout for analysis, e.g. 30s, 5m, default is 1m
timeout: 2m

# which dirs to skip: they won't be analyzed;
# can use regexp here: generated.*, regexp is applied on full path;
# default value is empty list, but next dirs are always skipped independently
# from this option's value:
# vendor$, third_party$, testdata$, examples$, Godeps$, builtin$
skip-dirs:
- configs

# by default isn't set. If set we pass it to "go list -mod={option}". From "go help modules":
# If invoked with -mod=readonly, the go command is disallowed from the implicit
# automatic updating of go.mod described above. Instead, it fails when any changes
Expand Down Expand Up @@ -43,7 +35,8 @@ linters-settings:
# default is false: such cases aren't reported by default.
check-blank: true
govet:
check-shadowing: true
enable:
- shadow
lll:
line-length: 120
misspell:
Expand All @@ -54,6 +47,14 @@ linters-settings:
check-exported: false

issues:
# Which dirs to exclude: issues from them won't be reported.
# Can use regexp here: `generated.*`, regexp is applied on full path,
# including the path prefix if one is set.
# Default dirs are skipped independently of this option's value (see exclude-dirs-use-default).
# "/" will be replaced by current OS file path separator to properly work on Windows.
# Default: []
exclude-dirs:
- configs
exclude-rules:
# SA1029 – Inappropriate key in call to context.WithValue
# https://staticcheck.io/docs/checks#SA1029
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# build stage
# =============================================================================

FROM golang:1.21.1-alpine AS builder
FROM golang:1.22.2-alpine AS builder

WORKDIR /sdk

Expand Down Expand Up @@ -33,7 +33,7 @@ FROM builder AS linter

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

# install goimports
RUN go install golang.org/x/tools/cmd/[email protected]
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ SDK, the Go version.

## Prerequisites

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

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

Refer to the
Expand Down
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/scribd/go-sdk

go 1.21
go 1.22

require (
github.com/DATA-DOG/go-sqlmock v1.5.0
Expand Down Expand Up @@ -51,7 +51,7 @@ require (
github.com/klauspost/compress v1.15.9 // indirect
github.com/magiconair/properties v1.8.5 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/mattn/go-sqlite3 v1.14.15 // indirect
github.com/mattn/go-sqlite3 v1.14.22 // indirect
github.com/mitchellh/mapstructure v1.4.3 // indirect
github.com/pelletier/go-toml v1.9.4 // indirect
github.com/philhofer/fwd v1.1.1 // indirect
Expand Down
3 changes: 2 additions & 1 deletion go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -184,8 +184,9 @@ github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hd
github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ=
github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
github.com/mattn/go-sqlite3 v1.14.15 h1:vfoHhTN1af61xCRSWzFIWzx2YskyMTwHLrExkBOjvxI=
github.com/mattn/go-sqlite3 v1.14.15/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg=
github.com/mattn/go-sqlite3 v1.14.22 h1:2gZY6PC6kBnID23Tichd1K+Z0oS6nE/XwU+Vz/5o4kU=
github.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=
github.com/mattn/goveralls v0.0.2/go.mod h1:8d1ZMHsd7fW6IRPKQh46F2WRpyib5/X4FOpevwGNQEw=
github.com/mediocregopher/radix/v3 v3.4.2/go.mod h1:8FL3F6UQRXHXIBSPUs5h0RybMF8i4n7wVopoX3x7Bv8=
github.com/microcosm-cc/bluemonday v1.0.2/go.mod h1:iVP4YcDBq+n/5fb23BhYFvIMq/leAFZyRl6bYmGDlGc=
Expand Down

0 comments on commit 040cf3f

Please sign in to comment.