Skip to content

Commit 0d1b1c9

Browse files
authored
fix: compatible with go1.18+ (#124)
1 parent 0777340 commit 0d1b1c9

File tree

5 files changed

+31
-39
lines changed

5 files changed

+31
-39
lines changed

.github/workflows/go.yml

+5-9
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,14 @@ on:
99

1010
jobs:
1111
build:
12-
name: Build
1312
runs-on: ubuntu-latest
1413
steps:
15-
16-
- name: Set up Go 1.x
17-
uses: actions/setup-go@v2
14+
- uses: actions/checkout@v3
15+
- name: Setup Go
16+
uses: actions/setup-go@v3
1817
with:
19-
go-version: ^1.13
20-
id: go
21-
22-
- name: Check out code into the Go module directory
23-
uses: actions/checkout@v2
18+
go-version: '>=1.15'
19+
check-latest: true
2420

2521
- name: Get dependencies
2622
run: go get -v -t -d ./...

.github/workflows/golangci-lint.yml

-17
This file was deleted.

.github/workflows/reviewdog.yml

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
name: reviewdog
2+
on: [pull_request]
3+
jobs:
4+
golangci-lint:
5+
name: runner / golangci-lint
6+
runs-on: ubuntu-latest
7+
steps:
8+
- name: Check out code into the Go module directory
9+
uses: actions/checkout@v3
10+
11+
- name: golangci-lint
12+
uses: reviewdog/action-golangci-lint@v2
13+
with:
14+
go_version: "1.16"
15+

go.mod

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
module github.com/rsocket/rsocket-go
22

3-
go 1.11
3+
go 1.15
44

55
require (
66
github.com/golang/mock v1.4.4
77
github.com/google/uuid v1.1.2
88
github.com/gorilla/websocket v1.4.2
9-
github.com/jjeffcaii/reactor-go v0.5.1
9+
github.com/jjeffcaii/reactor-go v0.5.3
1010
github.com/pkg/errors v0.9.1
1111
github.com/pkg/profile v1.5.0
12-
github.com/stretchr/testify v1.6.1
12+
github.com/stretchr/testify v1.7.1
1313
github.com/urfave/cli/v2 v2.3.0
1414
go.uber.org/atomic v1.7.0
1515
)

go.sum

+8-10
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ github.com/google/uuid v1.1.2 h1:EVhdT+1Kseyi1/pUmXKaFxYsDNy9RQYkMWRH68J/W7Y=
1010
github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
1111
github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc=
1212
github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
13-
github.com/jjeffcaii/reactor-go v0.5.1 h1:YG2SUE/Pag2ChZOcJ+Twfb+D10lNOavoYly+xUUbA7w=
14-
github.com/jjeffcaii/reactor-go v0.5.1/go.mod h1:qYN34C2UANFOtDeUGvhxlExLpFMDbvSrphX3Gb3H6S8=
15-
github.com/panjf2000/ants/v2 v2.4.3 h1:wHghL17YKFanB62QjPQ9o+DuM4q7WrQ7zAhoX8+eBXU=
16-
github.com/panjf2000/ants/v2 v2.4.3/go.mod h1:f6F0NZVFsGCp5A7QW/Zj/m92atWwOkY0OIhFxRNFr4A=
13+
github.com/jjeffcaii/reactor-go v0.5.3 h1:g1SKM7RB8rVxcapa8eitAvLXW/E7LPU2IClpxPDC0QY=
14+
github.com/jjeffcaii/reactor-go v0.5.3/go.mod h1:FVObesvqoZMF2/zrGgs6KkJ/GFJnNSS75jfCPlFqTOg=
15+
github.com/panjf2000/ants/v2 v2.5.0 h1:1rWGWSnxCsQBga+nQbA4/iY6VMeNoOIAM0ZWh9u3q2Q=
16+
github.com/panjf2000/ants/v2 v2.5.0/go.mod h1:cU93usDlihJZ5CfRGNDYsiBYvoilLvBF5Qp/BT2GNRE=
1717
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
1818
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
1919
github.com/pkg/profile v1.5.0 h1:042Buzk+NhDI+DeSAA62RwJL8VAuZUMQZUjCsRz1Mug=
@@ -26,9 +26,8 @@ github.com/shurcooL/sanitized_anchor_name v1.0.0 h1:PdmoCO6wvbs+7yrJyMORt4/BmY5I
2626
github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
2727
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
2828
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
29-
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
30-
github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0=
31-
github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
29+
github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY=
30+
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
3231
github.com/urfave/cli/v2 v2.3.0 h1:qph92Y649prgesehzOrQjdWyxFOp/QVM+6imKHad91M=
3332
github.com/urfave/cli/v2 v2.3.0/go.mod h1:LJmUH05zAU44vOAcrfzZQKsZbVcdbOG8rtL3/XcUArI=
3433
go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw=
@@ -41,8 +40,7 @@ golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
4140
golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
4241
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
4342
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
44-
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
4543
gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
46-
gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
47-
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
4844
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
45+
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo=
46+
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

0 commit comments

Comments
 (0)