Skip to content

Commit

Permalink
Use Go 1.22.1 (#4155)
Browse files Browse the repository at this point in the history
  • Loading branch information
AlekSi committed Mar 6, 2024
1 parent b2a4839 commit 5a5ca29
Show file tree
Hide file tree
Showing 10 changed files with 15 additions and 100 deletions.
4 changes: 2 additions & 2 deletions build/docker/all-in-one.Dockerfile
Expand Up @@ -14,7 +14,7 @@ ARG LABEL_COMMIT

# prepare stage

FROM --platform=$BUILDPLATFORM golang:1.22.0 AS all-in-one-prepare
FROM --platform=$BUILDPLATFORM golang:1.22.1 AS all-in-one-prepare

# use a single directory for all Go caches to simpliy RUN --mount commands below
ENV GOPATH /cache/gopath
Expand All @@ -38,7 +38,7 @@ EOF

# build stage

FROM golang:1.22.0 AS all-in-one-build
FROM golang:1.22.1 AS all-in-one-build

ARG TARGETARCH

Expand Down
6 changes: 3 additions & 3 deletions build/docker/development.Dockerfile
Expand Up @@ -12,7 +12,7 @@ ARG LABEL_COMMIT

# prepare stage

FROM --platform=$BUILDPLATFORM golang:1.22.0 AS development-prepare
FROM --platform=$BUILDPLATFORM golang:1.22.1 AS development-prepare

# use a single directory for all Go caches to simpliy RUN --mount commands below
ENV GOPATH /cache/gopath
Expand All @@ -36,7 +36,7 @@ EOF

# build stage

FROM golang:1.22.0 AS development-build
FROM golang:1.22.1 AS development-build

ARG TARGETARCH
ARG TARGETVARIANT
Expand Down Expand Up @@ -107,7 +107,7 @@ COPY --from=development-build /src/bin/ferretdb /ferretdb

# final stage

FROM golang:1.22.0 AS development
FROM golang:1.22.1 AS development

ENV GOCOVERDIR=/tmp/cover
ENV GORACE=halt_on_error=1,history_size=2
Expand Down
4 changes: 2 additions & 2 deletions build/docker/production.Dockerfile
Expand Up @@ -12,7 +12,7 @@ ARG LABEL_COMMIT

# prepare stage

FROM --platform=$BUILDPLATFORM golang:1.22.0 AS production-prepare
FROM --platform=$BUILDPLATFORM golang:1.22.1 AS production-prepare

# use a single directory for all Go caches to simpliy RUN --mount commands below
ENV GOPATH /cache/gopath
Expand All @@ -36,7 +36,7 @@ EOF

# build stage

FROM golang:1.22.0 AS production-build
FROM golang:1.22.1 AS production-build

ARG TARGETARCH
ARG TARGETVARIANT
Expand Down
2 changes: 2 additions & 0 deletions go.mod
Expand Up @@ -2,6 +2,8 @@ module github.com/FerretDB/FerretDB

go 1.22

toolchain go1.22.1

require (
github.com/AlekSi/pointer v1.2.0
github.com/SAP/go-hdb v1.8.5
Expand Down
2 changes: 2 additions & 0 deletions integration/go.mod
Expand Up @@ -2,6 +2,8 @@ module github.com/FerretDB/FerretDB/integration

go 1.22

toolchain go1.22.1

replace github.com/FerretDB/FerretDB => ../

require (
Expand Down
56 changes: 0 additions & 56 deletions tools/check.go

This file was deleted.

2 changes: 2 additions & 0 deletions tools/go.mod
Expand Up @@ -2,6 +2,8 @@ module github.com/FerretDB/FerretDB/tools

go 1.22

toolchain go1.22.1

require (
github.com/FerretDB/gh v0.1.3
github.com/go-task/task/v3 v3.34.1
Expand Down
2 changes: 2 additions & 0 deletions tools/golangci/go.mod
Expand Up @@ -4,6 +4,8 @@ module github.com/FerretDB/FerretDB/tools/golangci

go 1.22

toolchain go1.22.1

require github.com/golangci/golangci-lint v1.56.2

require (
Expand Down
25 changes: 0 additions & 25 deletions tools/old.go

This file was deleted.

12 changes: 0 additions & 12 deletions tools/tools.go
Expand Up @@ -12,11 +12,6 @@
// See the License for the specific language governing permissions and
// limitations under the License.

// Keep both old and new styles of build tags.

//go:build go1.22
// +build go1.22

package tools

import (
Expand All @@ -32,13 +27,6 @@ import (
_ "mvdan.cc/gofumpt"
)

// Check that `go` in $PATH have the right version.
// Catches problems like `/some/path/go generate` invocations where `/some/path/go` is 1.22+
// (that's checked by the build tags above), but just `go` in $PATH (typically something like `/usr/bin/go`)
// is an earlier version.

//go:generate go run check.go

//go:generate go build -v -o ../bin/ ./checkdocs
//go:generate go build -v -o ../bin/ ./checkswitch
//go:generate go build -v -o ../bin/ ./checkcomments
Expand Down

0 comments on commit 5a5ca29

Please sign in to comment.