Update to go1.18 (#1768)

This commit is contained in:
Manu Gupta
2022-03-21 10:47:41 -07:00
committed by GitHub
parent 2240baf308
commit 69f7a1f902
10 changed files with 12 additions and 14 deletions
+2 -2
View File
@@ -4,7 +4,7 @@ name: default
steps:
- name: download-dependencies
image: golang:1.17
image: golang:1.18
commands:
# wait for services to be ready.
# - cd scripts/liveness_probe
@@ -21,7 +21,7 @@ steps:
path: /go
- name: build
image: golang:1.17
image: golang:1.18
commands:
# build
+1 -1
View File
@@ -14,7 +14,7 @@ jobs:
- name: setup-go
uses: actions/setup-go@v2
with:
go-version: 1.17
go-version: 1.18
- name: capture current date
id: date
run: echo "::set-output name=date::$(date -u '+%Y-%m-%d-%H:%M:%S-%Z')"
+1 -1
View File
@@ -1,4 +1,4 @@
ARG GOLANG_VERSION=1.17
ARG GOLANG_VERSION=1.18
FROM golang:$GOLANG_VERSION
RUN echo $GOLANG_VERSION
+1 -1
View File
@@ -2,7 +2,7 @@ VERSION = "unset"
DATE=$(shell date -u +%Y-%m-%d-%H:%M:%S-%Z)
ifndef GOLANG_VERSION
override GOLANG_VERSION = 1.17
override GOLANG_VERSION = 1.18
endif
.PHONY: build
+1 -1
View File
@@ -10,7 +10,7 @@ environment:
GOPROXY: https://proxy.golang.org
SKIP_UNTIL_113: true
stack: go 1.17
stack: go 1.18
test_script:
- go version
+1 -1
View File
@@ -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.17
ARG GOLANG_VERSION=1.18
ARG ALPINE_VERSION=3.15
FROM golang:${GOLANG_VERSION}-alpine AS builder
+3 -3
View File
@@ -5,7 +5,7 @@ services:
context: .
dockerfile: cmd/proxy/Dockerfile
args:
GOLANG_VERSION: 1.17
GOLANG_VERSION: 1.18
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.17
GOLANG_VERSION: 1.18
command: ["./scripts/test_unit.sh"]
environment:
- GO_ENV=test
@@ -36,7 +36,7 @@ services:
context: .
dockerfile: Dockerfile.test
args:
GOLANG_VERSION: 1.17
GOLANG_VERSION: 1.18
command: ["./scripts/test_e2e.sh"]
azurite:
image: arafato/azurite:2.6.5
+1 -1
View File
@@ -1,6 +1,6 @@
module github.com/gomods/athens
go 1.17
go 1.18
require (
cloud.google.com/go/storage v1.20.0
-2
View File
@@ -119,7 +119,6 @@ github.com/bsm/go-vlq v0.0.0-20150828105119-ec6e8d4f5f4e/go.mod h1:N+BjUcTjSxc2m
github.com/bsm/redislock v0.4.2 h1:+7WydoauDwf5Qw0ajaI/g3t26dQ/ovGU0Dv59sVvQzc=
github.com/bsm/redislock v0.4.2/go.mod h1:zeuSDdDFtEDtbAgKsw7NDucfSVR0zLWBv8tMpro/6UM=
github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko=
github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY=
github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
@@ -716,7 +715,6 @@ golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBc
golang.org/x/sys v0.0.0-20220209214540-3681064d5158 h1:rm+CHSpPEEW2IsXUib1ThaHIjuBVZjxNgSKmBLFfD4c=
golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+1 -1
View File
@@ -1,4 +1,4 @@
FROM golang:1.17-stretch
FROM golang:1.18-stretch
WORKDIR /tmp