From 21fa5a61eba1be8727cfeaa223111e4ae87c2af3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Blaisot?= Date: Thu, 8 Feb 2024 09:46:15 +0100 Subject: [PATCH] Build using Golang 1.22.0 --- .github/workflows/release.yml | 2 +- docs/docker.md | 2 +- scripts/docker/cozy-app-dev/Dockerfile | 2 +- scripts/docker/production/Dockerfile | 2 +- scripts/packaging/installrequirements.sh | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 571f61e185a..d0940db99fa 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -82,7 +82,7 @@ jobs: uses: addnab/docker-run-action@v3 with: image: ${{ matrix.os }} - options: -v ${{ github.workspace }}:/build -e GOVERSION=1.21.3 + options: -v ${{ github.workspace }}:/build -e GOVERSION=1.22.0 run: | echo "[safe]" > /root/.gitconfig echo " directory = /build" >> /root/.gitconfig diff --git a/docs/docker.md b/docs/docker.md index d66af66795d..4f88cf95c92 100644 --- a/docs/docker.md +++ b/docs/docker.md @@ -41,7 +41,7 @@ docker run -it --rm --name cozy-stack \ --workdir /app \ -v $(pwd):/app \ -v $(pwd):/go/bin \ - golang:1.21 \ + golang:1.22 \ go get -v github.com/cozy/cozy-stack ``` diff --git a/scripts/docker/cozy-app-dev/Dockerfile b/scripts/docker/cozy-app-dev/Dockerfile index 5e54b6b4c91..3c252bd0e10 100644 --- a/scripts/docker/cozy-app-dev/Dockerfile +++ b/scripts/docker/cozy-app-dev/Dockerfile @@ -4,7 +4,7 @@ # Multi-stage image: this step builds cozy-stack (and mailhog) -FROM golang:1.21-bullseye as build +FROM golang:1.22-bullseye as build WORKDIR /app # MailHog diff --git a/scripts/docker/production/Dockerfile b/scripts/docker/production/Dockerfile index 3a4c24e16ef..0fa53b8cf43 100644 --- a/scripts/docker/production/Dockerfile +++ b/scripts/docker/production/Dockerfile @@ -3,7 +3,7 @@ # Multi-stage image: this step builds cozy-stack -FROM golang:1.21-bookworm as build +FROM golang:1.22-bookworm as build WORKDIR /app # Use docker layer caching to avoid redownloading go modules if the code has diff --git a/scripts/packaging/installrequirements.sh b/scripts/packaging/installrequirements.sh index 64e214f6bd1..b8cf7752f74 100755 --- a/scripts/packaging/installrequirements.sh +++ b/scripts/packaging/installrequirements.sh @@ -2,7 +2,7 @@ set -euo pipefail -GOVERSION="${GOVERSION:-1.21.3}" +GOVERSION="${GOVERSION:-1.22.0}" cd "$(dirname $0)/../.." if [ -f debian/changelog ]; then