Skip to content

Commit 2c6a966

Browse files
bnfinetbnfinet
committed
go 1.18
from golang v1.16 --> v1.18 golang.org/x/sys now requires go v1.17 or greater. It's become too painful to stay on 1.16
1 parent e5b8ae1 commit 2c6a966

File tree

8 files changed

+44
-839
lines changed

8 files changed

+44
-839
lines changed

‎.github/workflows/coverage.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
fail-fast: false
1919
matrix:
2020
# go: ['1.14', '1.15']
21-
go: ['1.16']
21+
go: ['1.18']
2222

2323
steps:
2424
- uses: actions/setup-go@v2

‎.travis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ services:
77
- docker
88

99
go:
10-
- "1.16"
10+
- "1.18"
1111

1212
env:
1313
- ISTRAVIS=true

‎CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@
44

55
Coming soon! Please document any work in progress here as part of your PR. It will be moved to the next tag when released.
66

7+
## v0.38.0
8+
9+
- upgrade golang to `v1.18` from `v1.16`
10+
711
## v0.37.0
812

913
- [allow configurable Write, Read and Idle timeouts for the http server](https://github.com/vouch/vouch-proxy/pull/468)

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# quay.io/vouch/vouch-proxy
22
# https://github.com/vouch/vouch-proxy
3-
FROM golang:1.16 AS builder
3+
FROM golang:1.18 AS builder
44

55
ARG UID=999
66
ARG GID=999

‎Dockerfile.alpine‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# quay.io/vouch/vouch-proxy
22
# https://github.com/vouch/vouch-proxy
3-
FROM golang:1.16 AS builder
3+
FROM golang:1.18 AS builder
44

55
ARG UID=999
66
ARG GID=999

‎do.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ fi
1313

1414
IMAGE=quay.io/vouch/vouch-proxy:latest
1515
ALPINE=quay.io/vouch/vouch-proxy:alpine-latest
16-
GOIMAGE=golang:1.16
16+
GOIMAGE=golang:1.18
1717
NAME=vouch-proxy
1818
HTTPPORT=9090
1919
GODOC_PORT=5050

‎go.mod‎

Lines changed: 32 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,54 @@
11
module github.com/vouch/vouch-proxy
22

3-
go 1.16
3+
go 1.18
44

55
require (
6-
cloud.google.com/go/compute v1.15.1 // indirect
7-
github.com/bmizerany/perks v0.0.0-20141205001514-d9a9656a3a4b // indirect
8-
github.com/dgryski/go-gk v0.0.0-20200319235926-a69029f61654 // indirect
96
github.com/golang-jwt/jwt v3.2.2+incompatible
107
github.com/google/go-cmp v0.5.9
118
github.com/gorilla/sessions v1.2.1
12-
github.com/influxdata/tdigest v0.0.1 // indirect
139
github.com/julienschmidt/httprouter v1.3.0
1410
github.com/karupanerura/go-mock-http-response v0.0.0-20171201120521-7c242a447d45
1511
github.com/kelseyhightower/envconfig v1.4.0
16-
github.com/mailru/easyjson v0.7.7 // indirect
1712
github.com/mitchellh/mapstructure v1.5.0
1813
github.com/nirasan/go-oauth-pkce-code-verifier v0.0.0-20220510032225-4f9f17eaec4c
1914
github.com/patrickmn/go-cache v2.1.0+incompatible
2015
github.com/spf13/viper v1.15.0
21-
github.com/streadway/quantile v0.0.0-20150917103942-b0c588724d25 // indirect
2216
github.com/stretchr/testify v1.8.1
2317
github.com/theckman/go-securerandom v0.1.1
2418
github.com/tsenart/vegeta v12.7.0+incompatible
25-
go.uber.org/multierr v1.9.0 // indirect
2619
go.uber.org/zap v1.24.0
2720
golang.org/x/net v0.5.0
2821
golang.org/x/oauth2 v0.4.0
2922
)
3023

31-
replace go.uber.org/atomic => go.uber.org/atomic v1.9.0
24+
require (
25+
cloud.google.com/go/compute v1.15.1 // indirect
26+
cloud.google.com/go/compute/metadata v0.2.3 // indirect
27+
github.com/bmizerany/perks v0.0.0-20141205001514-d9a9656a3a4b // indirect
28+
github.com/davecgh/go-spew v1.1.1 // indirect
29+
github.com/dgryski/go-gk v0.0.0-20200319235926-a69029f61654 // indirect
30+
github.com/fsnotify/fsnotify v1.6.0 // indirect
31+
github.com/golang/protobuf v1.5.2 // indirect
32+
github.com/gorilla/securecookie v1.1.1 // indirect
33+
github.com/hashicorp/hcl v1.0.0 // indirect
34+
github.com/influxdata/tdigest v0.0.1 // indirect
35+
github.com/josharian/intern v1.0.0 // indirect
36+
github.com/magiconair/properties v1.8.7 // indirect
37+
github.com/mailru/easyjson v0.7.7 // indirect
38+
github.com/pelletier/go-toml/v2 v2.0.6 // indirect
39+
github.com/pmezard/go-difflib v1.0.0 // indirect
40+
github.com/spf13/afero v1.9.3 // indirect
41+
github.com/spf13/cast v1.5.0 // indirect
42+
github.com/spf13/jwalterweatherman v1.1.0 // indirect
43+
github.com/spf13/pflag v1.0.5 // indirect
44+
github.com/streadway/quantile v0.0.0-20150917103942-b0c588724d25 // indirect
45+
github.com/subosito/gotenv v1.4.2 // indirect
46+
go.uber.org/atomic v1.10.0 // indirect
47+
go.uber.org/multierr v1.9.0 // indirect
48+
golang.org/x/sys v0.4.0 // indirect
49+
golang.org/x/text v0.6.0 // indirect
50+
google.golang.org/appengine v1.6.7 // indirect
51+
google.golang.org/protobuf v1.28.1 // indirect
52+
gopkg.in/ini.v1 v1.67.0 // indirect
53+
gopkg.in/yaml.v3 v3.0.1 // indirect
54+
)

‎go.sum‎

Lines changed: 3 additions & 825 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)