Skip to content

Commit 12c619e

Browse files
dhuidhui
authoredJan 26, 2025··
Fix CI (#1222)
* Run go mod tidy * Fix Github linting action Changes: * checkout before setting up go * pin golangci-lint version * Update supported db versions * Use start-single-node instead of start for cockroachdb
·
v4.18.2
1 parent bc06922 commit 12c619e

File tree

7 files changed

+18
-31
lines changed

7 files changed

+18
-31
lines changed
 

‎.github/workflows/ci.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ jobs:
99
name: lint
1010
runs-on: ubuntu-latest
1111
steps:
12+
- uses: actions/checkout@v4
1213
- uses: actions/setup-go@v5
1314
with:
1415
go-version: "1.23.x"
15-
- uses: actions/checkout@v4
1616
- name: golangci-lint
1717
uses: golangci/golangci-lint-action@v6
1818
with:
19-
version: latest
19+
version: v1.63.4
2020

2121
test:
2222
runs-on: ubuntu-latest

‎database/cockroachdb/cockroachdb_test.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@ import (
2626
const defaultPort = 26257
2727

2828
var (
29-
opts = dktest.Options{Cmd: []string{"start", "--insecure"}, PortRequired: true, ReadyFunc: isReady}
30-
// Released versions: https://www.cockroachlabs.com/docs/releases/
29+
opts = dktest.Options{Cmd: []string{"start-single-node", "--insecure"}, PortRequired: true, ReadyFunc: isReady}
30+
// Supported versions: https://www.cockroachlabs.com/docs/releases/release-support-policy#supported-versions
3131
specs = []dktesting.ContainerSpec{
32-
{ImageName: "cockroachdb/cockroach:v1.0.7", Options: opts},
33-
{ImageName: "cockroachdb/cockroach:v1.1.9", Options: opts},
34-
{ImageName: "cockroachdb/cockroach:v2.0.7", Options: opts},
35-
{ImageName: "cockroachdb/cockroach:v2.1.3", Options: opts},
32+
{ImageName: "cockroachdb/cockroach:latest-v24.3", Options: opts},
33+
{ImageName: "cockroachdb/cockroach:latest-v24.1", Options: opts},
34+
{ImageName: "cockroachdb/cockroach:latest-v23.2", Options: opts},
35+
{ImageName: "cockroachdb/cockroach:latest-v23.1", Options: opts},
3636
}
3737
)
3838

‎database/mysql/mysql_test.go

-6
Original file line numberDiff line numberDiff line change
@@ -40,17 +40,11 @@ var (
4040
}
4141
// Supported versions: https://www.mysql.com/support/supportedplatforms/database.html
4242
specs = []dktesting.ContainerSpec{
43-
{ImageName: "mysql:5.5", Options: opts},
44-
{ImageName: "mysql:5.6", Options: opts},
45-
{ImageName: "mysql:5.7", Options: opts},
4643
{ImageName: "mysql:8.0", Options: opts},
4744
{ImageName: "mysql:8.4", Options: opts},
4845
{ImageName: "mysql:9.0", Options: opts},
4946
}
5047
specsAnsiQuotes = []dktesting.ContainerSpec{
51-
{ImageName: "mysql:5.5", Options: optsAnsiQuotes},
52-
{ImageName: "mysql:5.6", Options: optsAnsiQuotes},
53-
{ImageName: "mysql:5.7", Options: optsAnsiQuotes},
5448
{ImageName: "mysql:8.0", Options: optsAnsiQuotes},
5549
{ImageName: "mysql:8.4", Options: optsAnsiQuotes},
5650
{ImageName: "mysql:9.0", Options: optsAnsiQuotes},

‎database/pgx/pgx_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,11 @@ var (
3434
PortRequired: true, ReadyFunc: isReady}
3535
// Supported versions: https://www.postgresql.org/support/versioning/
3636
specs = []dktesting.ContainerSpec{
37-
{ImageName: "postgres:12", Options: opts},
3837
{ImageName: "postgres:13", Options: opts},
3938
{ImageName: "postgres:14", Options: opts},
4039
{ImageName: "postgres:15", Options: opts},
4140
{ImageName: "postgres:16", Options: opts},
41+
{ImageName: "postgres:17", Options: opts},
4242
}
4343
)
4444

‎database/postgres/postgres_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@ var (
3535
PortRequired: true, ReadyFunc: isReady}
3636
// Supported versions: https://www.postgresql.org/support/versioning/
3737
specs = []dktesting.ContainerSpec{
38-
{ImageName: "postgres:12", Options: opts},
3938
{ImageName: "postgres:13", Options: opts},
4039
{ImageName: "postgres:14", Options: opts},
4140
{ImageName: "postgres:15", Options: opts},
4241
{ImageName: "postgres:16", Options: opts},
42+
{ImageName: "postgres:17", Options: opts},
4343
}
4444
)
4545

‎database/sqlserver/sqlserver_test.go

+3-1
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,10 @@ var (
4444
// Container versions: https://mcr.microsoft.com/v2/mssql/server/tags/list
4545
specs = []dktesting.ContainerSpec{
4646
{ImageName: "mcr.microsoft.com/azure-sql-edge:latest", Options: sqlEdgeOpts},
47-
{ImageName: "mcr.microsoft.com/mssql/server:2017-latest", Options: sqlServerOpts},
47+
{ImageName: "mcr.microsoft.com/mssql/server:2022-latest", Options: sqlServerOpts},
4848
{ImageName: "mcr.microsoft.com/mssql/server:2019-latest", Options: sqlServerOpts},
49+
// Add back support for 2017 version once the image is fixed: https://github.com/microsoft/mssql-docker/issues/899
50+
// {ImageName: "mcr.microsoft.com/mssql/server:2017-latest", Options: sqlServerOpts},
4951
}
5052
)
5153

‎go.sum

+5-14
Original file line numberDiff line numberDiff line change
@@ -153,8 +153,6 @@ github.com/danieljoos/wincred v1.1.2/go.mod h1:GijpziifJoIBfYh+S7BbkdUTU4LfM+QnG
153153
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
154154
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
155155
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
156-
github.com/dhui/dktest v0.4.3 h1:wquqUxAFdcUgabAVLvSCOKOlag5cIZuaOjYIBOWdsR0=
157-
github.com/dhui/dktest v0.4.3/go.mod h1:zNK8IwktWzQRm6I/l2Wjp7MakiyaFWv4G1hjmodmMTs=
158156
github.com/dhui/dktest v0.4.4 h1:+I4s6JRE1yGuqflzwqG+aIaMdgXIorCf5P98JnaAWa8=
159157
github.com/dhui/dktest v0.4.4/go.mod h1:4+22R4lgsdAXrDyaH4Nqx2JEz2hLp49MqQmm9HLCQhM=
160158
github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk=
@@ -650,8 +648,7 @@ golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5y
650648
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
651649
golang.org/x/crypto v0.0.0-20220511200225-c6db032c6c88/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
652650
golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
653-
golang.org/x/crypto v0.27.0 h1:GXm2NjJrPaiv/h1tb2UH8QfgC/hOf/+z0p6PT8o1w7A=
654-
golang.org/x/crypto v0.27.0/go.mod h1:1Xngt8kV6Dvbssa53Ziq6Eqn0HqbZi5Z6R0ZpwQzt70=
651+
golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U=
655652
golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
656653
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
657654
golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
@@ -711,8 +708,7 @@ golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qx
711708
golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
712709
golang.org/x/net v0.0.0-20220624214902-1bab6f366d9e/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
713710
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
714-
golang.org/x/net v0.29.0 h1:5ORfpBpCs4HzDYoodCDBbwHzdR5UrLBZ3sOnUJmFoHo=
715-
golang.org/x/net v0.29.0/go.mod h1:gLkgy8jTGERgjzMic6DS9+SP0ajcu6Xu3Orq/SpETg0=
711+
golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I=
716712
golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
717713
golang.org/x/oauth2 v0.0.0-20180227000427-d7d64896b5ff/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
718714
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
@@ -730,8 +726,7 @@ golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJ
730726
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
731727
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
732728
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
733-
golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ=
734-
golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
729+
golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ=
735730
golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
736731
golang.org/x/sys v0.0.0-20180224232135-f6cff0780e54/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
737732
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -774,15 +769,12 @@ golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBc
774769
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
775770
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
776771
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
777-
golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34=
778-
golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
779772
golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
780773
golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
781774
golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
782775
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
783776
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
784-
golang.org/x/term v0.24.0 h1:Mh5cbb+Zk2hqqXNO7S1iTjEphVL+jb8ZWaqh/g+JWkM=
785-
golang.org/x/term v0.24.0/go.mod h1:lOBK/LVxemqiMij05LGJ0tzNr8xlmwBRJ81PX6wVLH8=
777+
golang.org/x/term v0.27.0 h1:WP60Sv1nlK1T6SupCHbXzSaN0b9wUmsPoRS9b61A23Q=
786778
golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM=
787779
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
788780
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -794,8 +786,7 @@ golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
794786
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
795787
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
796788
golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
797-
golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224=
798-
golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
789+
golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
799790
golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
800791
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
801792
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=

0 commit comments

Comments
 (0)
Please sign in to comment.