Skip to content

Commit

Permalink
Default to go1.17.11 (github#1136)
Browse files Browse the repository at this point in the history
* Default to go1.17.11

* `go mod vendor`

Co-authored-by: dm-2 <[email protected]>
  • Loading branch information
2 people authored and RainbowDashy committed Jul 11, 2022
1 parent ad3bb94 commit 4171a00
Show file tree
Hide file tree
Showing 19 changed files with 39 additions and 212 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ jobs:
steps:
- uses: actions/checkout@v2

- name: Set up Go 1.16
- name: Set up Go
uses: actions/setup-go@v1
with:
go-version: 1.16
go-version: 1.17

- name: Build
run: script/cibuild
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/golangci-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
steps:
- uses: actions/setup-go@v3
with:
go-version: 1.16
go-version: 1.17
- uses: actions/checkout@v3
- name: golangci-lint
uses: golangci/golangci-lint-action@v3
4 changes: 2 additions & 2 deletions .github/workflows/replica-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ jobs:
steps:
- uses: actions/checkout@v2

- name: Set up Go 1.16
- name: Set up Go
uses: actions/setup-go@v1
with:
go-version: 1.16
go-version: 1.17

- name: migration tests
env:
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.packaging
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.16.4
FROM golang:1.17

RUN apt-get update
RUN apt-get install -y ruby ruby-dev rubygems build-essential
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.test
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.16.4
FROM golang:1.17
LABEL maintainer="[email protected]"

RUN apt-get update
Expand Down
13 changes: 12 additions & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/github/gh-ost

go 1.16
go 1.17

require (
github.com/go-ini/ini v1.62.0
Expand All @@ -13,6 +13,17 @@ require (
golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83
golang.org/x/net v0.0.0-20210224082022-3d97a244fca7
golang.org/x/text v0.3.6
)

require (
github.com/pingcap/errors v0.11.5-0.20201126102027-b0a155152ca3 // indirect
github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24 // indirect
github.com/siddontang/go v0.0.0-20180604090527-bdc77568d726 // indirect
github.com/siddontang/go-log v0.0.0-20180807004314-8d05993dda07 // indirect
go.uber.org/atomic v1.7.0 // indirect
go.uber.org/multierr v1.6.0 // indirect
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68 // indirect
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 // indirect
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
gopkg.in/ini.v1 v1.62.0 // indirect
)
8 changes: 4 additions & 4 deletions script/ensure-go-installed
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
#!/bin/bash

PREFERRED_GO_VERSION=go1.16.4
SUPPORTED_GO_VERSIONS='go1.1[56]'
PREFERRED_GO_VERSION=go1.17.11
SUPPORTED_GO_VERSIONS='go1.1[567]'

GO_PKG_DARWIN=${PREFERRED_GO_VERSION}.darwin-amd64.pkg
GO_PKG_DARWIN_SHA=0f215de06019a054a3da46a0722989986c956d719c7a0a8fc38a5f3c216d6f6b
GO_PKG_DARWIN_SHA=4f924c534230de8f0e1c7369f611c0310efd21fc2d9438b13bc2703af9dda25a

GO_PKG_LINUX=${PREFERRED_GO_VERSION}.linux-amd64.tar.gz
GO_PKG_LINUX_SHA=4a7fa60f323ee1416a4b1425aefc37ea359e9d64df19c326a58953a97ad41ea5
GO_PKG_LINUX_SHA=d69a4fe2694f795d8e525c72b497ededc209cb7185f4c3b62d7a98dd6227b3fe

export ROOTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )/.." && pwd )"
cd $ROOTDIR
Expand Down
3 changes: 0 additions & 3 deletions vendor/github.com/go-sql-driver/mysql/go.mod

This file was deleted.

11 changes: 0 additions & 11 deletions vendor/github.com/pingcap/errors/go.mod

This file was deleted.

66 changes: 0 additions & 66 deletions vendor/github.com/pingcap/errors/go.sum

This file was deleted.

8 changes: 0 additions & 8 deletions vendor/go.uber.org/atomic/go.mod

This file was deleted.

9 changes: 0 additions & 9 deletions vendor/go.uber.org/atomic/go.sum

This file was deleted.

8 changes: 0 additions & 8 deletions vendor/go.uber.org/multierr/go.mod

This file was deleted.

11 changes: 0 additions & 11 deletions vendor/go.uber.org/multierr/go.sum

This file was deleted.

13 changes: 0 additions & 13 deletions vendor/go.uber.org/zap/go.mod

This file was deleted.

56 changes: 0 additions & 56 deletions vendor/go.uber.org/zap/go.sum

This file was deleted.

5 changes: 0 additions & 5 deletions vendor/golang.org/x/term/go.mod

This file was deleted.

2 changes: 0 additions & 2 deletions vendor/golang.org/x/term/go.sum

This file was deleted.

24 changes: 16 additions & 8 deletions vendor/modules.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,68 +2,76 @@
## explicit
github.com/go-ini/ini
# github.com/go-mysql-org/go-mysql v1.3.0
## explicit
## explicit; go 1.16
github.com/go-mysql-org/go-mysql/client
github.com/go-mysql-org/go-mysql/mysql
github.com/go-mysql-org/go-mysql/packet
github.com/go-mysql-org/go-mysql/replication
github.com/go-mysql-org/go-mysql/utils
# github.com/go-sql-driver/mysql v1.6.0
## explicit
## explicit; go 1.10
github.com/go-sql-driver/mysql
# github.com/openark/golib v0.0.0-20210531070646-355f37940af8
## explicit
## explicit; go 1.16
github.com/openark/golib/log
github.com/openark/golib/sqlutils
github.com/openark/golib/tests
# github.com/pingcap/errors v0.11.5-0.20201126102027-b0a155152ca3
## explicit; go 1.14
github.com/pingcap/errors
# github.com/satori/go.uuid v1.2.0
## explicit
github.com/satori/go.uuid
# github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24
## explicit
github.com/shopspring/decimal
# github.com/siddontang/go v0.0.0-20180604090527-bdc77568d726
## explicit
github.com/siddontang/go/hack
# github.com/siddontang/go-log v0.0.0-20180807004314-8d05993dda07
## explicit
github.com/siddontang/go-log/log
github.com/siddontang/go-log/loggers
# github.com/smartystreets/goconvey v1.6.4
## explicit
# go.uber.org/atomic v1.7.0
## explicit; go 1.13
go.uber.org/atomic
# go.uber.org/multierr v1.6.0
## explicit; go 1.12
go.uber.org/multierr
# go.uber.org/zap v1.16.0
## explicit
## explicit; go 1.13
go.uber.org/zap
go.uber.org/zap/buffer
go.uber.org/zap/internal/bufferpool
go.uber.org/zap/internal/color
go.uber.org/zap/internal/exit
go.uber.org/zap/zapcore
# golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83
## explicit
## explicit; go 1.11
golang.org/x/crypto/ssh/terminal
# golang.org/x/net v0.0.0-20210224082022-3d97a244fca7
## explicit
## explicit; go 1.11
golang.org/x/net/context
# golang.org/x/sys v0.0.0-20201119102817-f84b799fce68
## explicit; go 1.12
golang.org/x/sys/internal/unsafeheader
golang.org/x/sys/plan9
golang.org/x/sys/unix
golang.org/x/sys/windows
# golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1
## explicit; go 1.11
golang.org/x/term
# golang.org/x/text v0.3.6
## explicit
## explicit; go 1.11
golang.org/x/text/encoding
golang.org/x/text/encoding/charmap
golang.org/x/text/encoding/internal
golang.org/x/text/encoding/internal/identifier
golang.org/x/text/encoding/simplifiedchinese
golang.org/x/text/transform
# gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c
## explicit
## explicit; go 1.11
# gopkg.in/ini.v1 v1.62.0
## explicit

0 comments on commit 4171a00

Please sign in to comment.