From 174fdd832ea548b0db392d72e1c5617744c02e81 Mon Sep 17 00:00:00 2001 From: Kenny Root Date: Thu, 21 Dec 2023 15:11:06 -0800 Subject: [PATCH] Update to Go 1.21 Since Go 1.21 has been released, the Go 1.18 version has been deprecated according to Go's release plan documents. Update the builder to 1.21 and run tests on everything from Go 1.17 through 1.21. --- .github/workflows/ci.yml | 13 +++++++------ Dockerfile | 2 +- go.mod | 38 +++++++++++++++++++++++++++++++++----- go.sum | 3 --- 4 files changed, 41 insertions(+), 15 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0188743a..6907da49 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -30,7 +30,7 @@ jobs: strategy: matrix: golang: - - 1.16.x + - 1.21.x steps: - uses: actions/checkout@v2 - name: Install Go @@ -46,7 +46,7 @@ jobs: strategy: matrix: golang: - - 1.16.x + - 1.21.x steps: - uses: actions/checkout@v2 - name: Install Go @@ -67,10 +67,11 @@ jobs: strategy: matrix: golang: - - 1.13.x - - 1.14.x - - 1.15.x - - 1.16.x + - 1.17.x + - 1.18.x + - 1.19.x + - 1.20.x + - 1.21.x steps: - uses: actions/checkout@v2 - name: Install Go diff --git a/Dockerfile b/Dockerfile index 4b2816a1..11e2fce5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # build -FROM golang:1.18.0 as builder +FROM golang:1.21.0 as builder ENV GO111MODULE=on WORKDIR /go/src/moul.io/sshportal COPY go.mod go.sum ./ diff --git a/go.mod b/go.mod index 52253bc5..8f0a73f8 100644 --- a/go.mod +++ b/go.mod @@ -4,20 +4,18 @@ require ( github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be github.com/arkan/bastion v0.0.0-20200502094720-e8e001ca766b github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d - github.com/cpuguy83/go-md2man/v2 v2.0.0 // indirect - github.com/creack/pty v1.1.11 // indirect github.com/docker/docker v20.10.12+incompatible github.com/dustin/go-humanize v1.0.0 github.com/gliderlabs/ssh v0.3.3 github.com/go-gormigrate/gormigrate/v2 v2.0.0 github.com/kr/pty v1.1.8 - github.com/mattn/go-colorable v0.1.8 // indirect - github.com/mattn/go-runewidth v0.0.12 // indirect github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d github.com/olekukonko/tablewriter v0.0.5 github.com/pkg/errors v0.9.1 github.com/reiver/go-oi v1.0.0 github.com/reiver/go-telnet v0.0.0-20180421082511-9ff0b2ab096e + github.com/rivo/uniseg v0.2.0 // indirect + github.com/russross/blackfriday/v2 v2.1.0 // indirect github.com/smartystreets/goconvey v1.7.2 github.com/tailscale/depaware v0.0.0-20210622194025-720c4b409502 github.com/urfave/cli v1.22.5 @@ -31,4 +29,34 @@ require ( moul.io/srand v1.6.1 ) -go 1.14 +require ( + github.com/cpuguy83/go-md2man/v2 v2.0.0 // indirect + github.com/creack/pty v1.1.11 // indirect + github.com/go-sql-driver/mysql v1.6.0 // indirect + github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 // indirect + github.com/jackc/chunkreader/v2 v2.0.1 // indirect + github.com/jackc/pgconn v1.10.1 // indirect + github.com/jackc/pgio v1.0.0 // indirect + github.com/jackc/pgpassfile v1.0.0 // indirect + github.com/jackc/pgproto3/v2 v2.2.0 // indirect + github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b // indirect + github.com/jackc/pgtype v1.9.0 // indirect + github.com/jackc/pgx/v4 v4.14.0 // indirect + github.com/jinzhu/inflection v1.0.0 // indirect + github.com/jinzhu/now v1.1.4 // indirect + github.com/jtolds/gls v4.20.0+incompatible // indirect + github.com/mattn/go-colorable v0.1.8 // indirect + github.com/mattn/go-isatty v0.0.12 // indirect + github.com/mattn/go-runewidth v0.0.12 // indirect + github.com/mattn/go-sqlite3 v1.14.9 // indirect + github.com/pkg/diff v0.0.0-20200914180035-5b29258ca4f7 // indirect + github.com/rivo/uniseg v0.2.0 // indirect + github.com/russross/blackfriday/v2 v2.1.0 // indirect + github.com/smartystreets/assertions v1.2.0 // indirect + golang.org/x/mod v0.8.0 // indirect + golang.org/x/sys v0.15.0 // indirect + golang.org/x/term v0.15.0 // indirect + golang.org/x/text v0.14.0 // indirect +) + +go 1.17 diff --git a/go.sum b/go.sum index 95628395..b8c92407 100644 --- a/go.sum +++ b/go.sum @@ -126,12 +126,10 @@ github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfV 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/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= -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/pty v1.1.8 h1:AkaSdXYQOWeaO3neb8EM634ahkXXe3jYbVh/F9lq+GI= github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw= -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/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lib/pq v1.1.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= @@ -318,7 +316,6 @@ golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= 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/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/inconshreveable/log15.v2 v2.0.0-20180818164646-67afb5ed74ec/go.mod h1:aPpfJ7XW+gOuirDoZ8gHhLh3kZ1B08FtV2bbmy7Jv3s=