Skip to content

Commit

Permalink
Bump Go version (#4599)
Browse files Browse the repository at this point in the history
  • Loading branch information
AlekSi authored Oct 2, 2024
1 parent 8532355 commit 4bfcf22
Show file tree
Hide file tree
Showing 13 changed files with 1,222 additions and 23 deletions.
24 changes: 14 additions & 10 deletions .github/workflows/packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -112,9 +112,13 @@ jobs:
run: bin/task docker-local FILE=production

- name: Extract Docker image names
id: extract
id: tag
uses: FerretDB/github-actions/extract-docker-tag@main

# - name: Define Docker image names
# id: tag
# run: bin/definedockertag

- name: Login to Docker Hub
uses: docker/login-action@v3
with:
Expand All @@ -135,17 +139,17 @@ jobs:
username: ferretdbbot
password: ${{ secrets.QUAY_TOKEN }}

- name: Build and push all-in-one Docker images ${{ steps.extract.outputs.all_in_one_images }}
if: steps.extract.outputs.all_in_one_images != ''
run: bin/task docker-all-in-one-push DOCKER_IMAGES=${{ steps.extract.outputs.all_in_one_images }}
- name: Build and push all-in-one Docker images ${{ steps.tag.outputs.all_in_one_images }}
if: steps.tag.outputs.all_in_one_images != ''
run: bin/task docker-all-in-one-push DOCKER_IMAGES=${{ steps.tag.outputs.all_in_one_images }}

- name: Build and push development Docker images ${{ steps.extract.outputs.development_images }}
if: steps.extract.outputs.development_images != ''
run: bin/task docker-development-push DOCKER_IMAGES=${{ steps.extract.outputs.development_images }}
- name: Build and push development Docker images ${{ steps.tag.outputs.development_images }}
if: steps.tag.outputs.development_images != ''
run: bin/task docker-development-push DOCKER_IMAGES=${{ steps.tag.outputs.development_images }}

- name: Build and push production Docker images ${{ steps.extract.outputs.production_images }}
if: steps.extract.outputs.production_images != ''
run: bin/task docker-production-push DOCKER_IMAGES=${{ steps.extract.outputs.production_images }}
- name: Build and push production Docker images ${{ steps.tag.outputs.production_images }}
if: steps.tag.outputs.production_images != ''
run: bin/task docker-production-push DOCKER_IMAGES=${{ steps.tag.outputs.production_images }}

- name: Build development binaries
run: bin/task build-development
Expand Down
4 changes: 2 additions & 2 deletions build/ferretdb/all-in-one.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ ARG LABEL_COMMIT

# prepare stage

FROM --platform=$BUILDPLATFORM golang:1.23.1 AS all-in-one-prepare
FROM --platform=$BUILDPLATFORM golang:1.23.2 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.23.1 AS all-in-one-build
FROM golang:1.23.2 AS all-in-one-build

ARG TARGETARCH

Expand Down
6 changes: 3 additions & 3 deletions build/ferretdb/development.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ ARG LABEL_COMMIT

# prepare stage

FROM --platform=$BUILDPLATFORM golang:1.23.1 AS development-prepare
FROM --platform=$BUILDPLATFORM golang:1.23.2 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.23.1 AS development-build
FROM golang:1.23.2 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.23.1 AS development
FROM golang:1.23.2 AS development

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

# prepare stage

FROM --platform=$BUILDPLATFORM golang:1.23.1 AS production-prepare
FROM --platform=$BUILDPLATFORM golang:1.23.2 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.23.1 AS production-build
FROM golang:1.23.2 AS production-build

ARG TARGETARCH
ARG TARGETVARIANT
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ module github.com/FerretDB/FerretDB

go 1.23

toolchain go1.23.1
toolchain go1.23.2

require (
github.com/AlekSi/pointer v1.2.0
Expand Down
2 changes: 1 addition & 1 deletion integration/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ module github.com/FerretDB/FerretDB/integration

go 1.23

toolchain go1.23.1
toolchain go1.23.2

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

Expand Down
Loading

0 comments on commit 4bfcf22

Please sign in to comment.