From 10348e2b50ef19f922567b70e539d793f40cf35b Mon Sep 17 00:00:00 2001 From: Ivan Krutov Date: Fri, 3 Sep 2021 13:40:03 +0300 Subject: [PATCH] Bump Golang to 1.17 --- .github/workflows/build.yml | 2 +- .github/workflows/release.yml | 2 +- .github/workflows/test.yml | 2 +- go.mod | 9 ++++++++- go.sum | 3 --- selenium/android/Dockerfile | 2 +- selenium/base/Dockerfile | 2 +- selenium/base/fileserver/go.mod | 2 +- selenium/external-host/Dockerfile | 2 +- static/chrome/Dockerfile | 2 +- 10 files changed, 16 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a595456e4..9972c37cb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -14,7 +14,7 @@ jobs: - name: Setup Golang uses: actions/setup-go@v2 with: - go-version: 1.15.x + go-version: 1.17.x - uses: actions/cache@v1 with: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 02c9ba9b9..2bd0da785 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -13,7 +13,7 @@ jobs: - name: Setup Golang uses: actions/setup-go@v2 with: - go-version: 1.15.x + go-version: 1.17.x - uses: actions/cache@v1 with: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 3d4548493..a5572b6b5 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -12,7 +12,7 @@ jobs: - name: Setup Golang uses: actions/setup-go@v2 with: - go-version: 1.15.x + go-version: 1.17.x - uses: actions/cache@v1 with: diff --git a/go.mod b/go.mod index b784839e2..8d8626b32 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/aerokube/images -go 1.15 +go 1.17 require ( github.com/aandryashin/matchers v0.0.0-20161126170413-435295ea180e @@ -11,3 +11,10 @@ require ( github.com/spf13/cobra v1.1.1 gopkg.in/cheggaaa/pb.v1 v1.0.28 ) + +require ( + github.com/gobuffalo/here v0.6.0 // indirect + github.com/inconshreveable/mousetrap v1.0.0 // indirect + github.com/spf13/pflag v1.0.5 // indirect + golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae // indirect +) diff --git a/go.sum b/go.sum index 717429b5d..48caddcd6 100644 --- a/go.sum +++ b/go.sum @@ -106,10 +106,8 @@ github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvW github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= -github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= -github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= github.com/markbates/pkger v0.17.1 h1:/MKEtWqtc0mZvu9OinB9UzVN9iYCwLWuyUv4Bw+PCno= @@ -299,7 +297,6 @@ google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiq google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/cheggaaa/pb.v1 v1.0.28 h1:n1tBJnnK2r7g9OW2btFH91V92STTUevLXYFb8gy9EMk= gopkg.in/cheggaaa/pb.v1 v1.0.28/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw= diff --git a/selenium/android/Dockerfile b/selenium/android/Dockerfile index cfe8e5347..c1262d999 100644 --- a/selenium/android/Dockerfile +++ b/selenium/android/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.15 as go +FROM golang:1.17 as go COPY tmp/devtools /devtools diff --git a/selenium/base/Dockerfile b/selenium/base/Dockerfile index dda0ad3a8..6d0c4f675 100644 --- a/selenium/base/Dockerfile +++ b/selenium/base/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.15 as go +FROM golang:1.17 as go COPY xseld /xseld diff --git a/selenium/base/fileserver/go.mod b/selenium/base/fileserver/go.mod index d7ece02ab..7cd64eb2d 100644 --- a/selenium/base/fileserver/go.mod +++ b/selenium/base/fileserver/go.mod @@ -1,5 +1,5 @@ module fileserver -go 1.15 +go 1.17 require github.com/aandryashin/matchers v0.0.0-20161126170413-435295ea180e diff --git a/selenium/external-host/Dockerfile b/selenium/external-host/Dockerfile index 225ff5287..6bc4ef777 100644 --- a/selenium/external-host/Dockerfile +++ b/selenium/external-host/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.15 as go +FROM golang:1.17 as go COPY choose /choose diff --git a/static/chrome/Dockerfile b/static/chrome/Dockerfile index f4d9757f9..e4e43372a 100644 --- a/static/chrome/Dockerfile +++ b/static/chrome/Dockerfile @@ -1,5 +1,5 @@ ARG VERSION -FROM golang:1.15 as go +FROM golang:1.17 as go COPY devtools /devtools