diff --git a/.github/workflows/goreleaser.yml b/.github/workflows/goreleaser.yml index 3a7af6f1..273c1bd6 100644 --- a/.github/workflows/goreleaser.yml +++ b/.github/workflows/goreleaser.yml @@ -14,7 +14,7 @@ jobs: - name: setup-go uses: actions/setup-go@v2 with: - go-version: 1.19 + go-version: "1.20" - name: capture current date id: date run: echo "::set-output name=date::$(date -u '+%Y-%m-%d-%H:%M:%S-%Z')" diff --git a/Dockerfile.test b/Dockerfile.test index 25ed1dfb..fc205e3f 100644 --- a/Dockerfile.test +++ b/Dockerfile.test @@ -1,4 +1,4 @@ -ARG GOLANG_VERSION=1.19 +ARG GOLANG_VERSION=1.20 FROM golang:$GOLANG_VERSION RUN echo $GOLANG_VERSION diff --git a/Makefile b/Makefile index f99c2162..52a962ed 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ DATE=$(shell date -u +%Y-%m-%d-%H:%M:%S-%Z) GOLANGCI_LINT_VERSION=v1.51.2 ifndef GOLANG_VERSION -override GOLANG_VERSION = 1.19 +override GOLANG_VERSION = 1.20 endif .PHONY: build diff --git a/appveyor.yml b/appveyor.yml index c595b6cc..6ae53ddf 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -10,7 +10,7 @@ environment: GOPROXY: https://proxy.golang.org SKIP_UNTIL_113: true -stack: go 1.19 +stack: go 1.20 test_script: - go version diff --git a/cmd/proxy/Dockerfile b/cmd/proxy/Dockerfile index 9621ff13..d77565d2 100644 --- a/cmd/proxy/Dockerfile +++ b/cmd/proxy/Dockerfile @@ -5,7 +5,7 @@ # You can override the Go version used to build the image. # See project Makefile if using make. # See docker --build-arg if building directly. -ARG GOLANG_VERSION=1.19 +ARG GOLANG_VERSION=1.20 ARG ALPINE_VERSION=3.15 FROM golang:${GOLANG_VERSION}-alpine AS builder diff --git a/docker-compose.yml b/docker-compose.yml index 0d387235..cb5910de 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -5,7 +5,7 @@ services: context: . dockerfile: cmd/proxy/Dockerfile args: - GOLANG_VERSION: 1.19 + GOLANG_VERSION: 1.20 environment: - ATHENS_MONGO_STORAGE_URL=mongodb://mongo:27017 - TIMEOUT=20 # in case the mongo dependency takes longer to start up @@ -20,7 +20,7 @@ services: context: . dockerfile: Dockerfile.test args: - GOLANG_VERSION: 1.19 + GOLANG_VERSION: 1.20 command: ["./scripts/test_unit.sh"] environment: - GO_ENV=test @@ -36,7 +36,7 @@ services: context: . dockerfile: Dockerfile.test args: - GOLANG_VERSION: 1.19 + GOLANG_VERSION: 1.20 command: ["./scripts/test_e2e.sh"] azurite: image: arafato/azurite:2.6.5 diff --git a/go.mod b/go.mod index 78bdd39f..45935159 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/gomods/athens -go 1.19 +go 1.20 require ( cloud.google.com/go/storage v1.20.0 diff --git a/scripts/build-image/Dockerfile b/scripts/build-image/Dockerfile index 0261d958..f462a39d 100644 --- a/scripts/build-image/Dockerfile +++ b/scripts/build-image/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.19-bullseye +FROM golang:1.20-bullseye WORKDIR /tmp