From 7d47e88e36818a028ff56d9190a2e796c0adacd0 Mon Sep 17 00:00:00 2001 From: Marina Biryukova Date: Mon, 28 Aug 2023 14:09:40 +0300 Subject: [PATCH] [#76] Add go1.21 to CI Signed-off-by: Marina Biryukova --- .forgejo/workflows/builds.yml | 2 +- .forgejo/workflows/dco.yml | 2 +- .forgejo/workflows/tests.yml | 2 +- .forgejo/workflows/vulncheck.yml | 2 +- Dockerfile | 2 +- Makefile | 2 +- go.mod | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.forgejo/workflows/builds.yml b/.forgejo/workflows/builds.yml index 3df5081..aac6857 100644 --- a/.forgejo/workflows/builds.yml +++ b/.forgejo/workflows/builds.yml @@ -6,7 +6,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - go_versions: [ '1.19', '1.20' ] + go_versions: [ '1.20', '1.21' ] fail-fast: false steps: - uses: actions/checkout@v3 diff --git a/.forgejo/workflows/dco.yml b/.forgejo/workflows/dco.yml index 6cbe4dd..3d38c4b 100644 --- a/.forgejo/workflows/dco.yml +++ b/.forgejo/workflows/dco.yml @@ -12,7 +12,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v3 with: - go-version: '1.20' + go-version: '1.21' - name: Run commit format checker uses: https://git.frostfs.info/TrueCloudLab/dco-go@v1 diff --git a/.forgejo/workflows/tests.yml b/.forgejo/workflows/tests.yml index 7a03020..d448a87 100644 --- a/.forgejo/workflows/tests.yml +++ b/.forgejo/workflows/tests.yml @@ -17,7 +17,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - go_versions: [ '1.19', '1.20' ] + go_versions: [ '1.20', '1.21' ] fail-fast: false steps: - uses: actions/checkout@v3 diff --git a/.forgejo/workflows/vulncheck.yml b/.forgejo/workflows/vulncheck.yml index 0c9e908..0139e89 100644 --- a/.forgejo/workflows/vulncheck.yml +++ b/.forgejo/workflows/vulncheck.yml @@ -12,7 +12,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v3 with: - go-version: '1.20' + go-version: '1.21' - name: Install govulncheck run: go install golang.org/x/vuln/cmd/govulncheck@latest diff --git a/Dockerfile b/Dockerfile index 189dc22..8b450a4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.19-alpine as basebuilder +FROM golang:1.21-alpine as basebuilder RUN apk add --update make bash ca-certificates FROM basebuilder as builder diff --git a/Makefile b/Makefile index a4db526..6b6fa72 100755 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ REPO ?= $(shell go list -m) VERSION ?= $(shell git describe --tags --match "v*" --dirty --always --abbrev=8 2>/dev/null || cat VERSION 2>/dev/null || echo "develop") -GO_VERSION ?= 1.19 +GO_VERSION ?= 1.20 LINT_VERSION ?= 1.49.0 BUILD ?= $(shell date -u --iso=seconds) diff --git a/go.mod b/go.mod index 632997f..6e6bc80 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module git.frostfs.info/TrueCloudLab/frostfs-http-gw -go 1.19 +go 1.20 require ( git.frostfs.info/TrueCloudLab/frostfs-api-go/v2 v2.15.1-0.20230802075510-964c3edb3f44