Skip to content

Commit 42fa023

Browse files
authored
Merge pull request #20 from moshebe/upgrade-to-go1.18
Upgrade to go1.18 and adjust CI
2 parents 3a0f850 + 927ab64 commit 42fa023

File tree

3 files changed

+96
-36
lines changed

3 files changed

+96
-36
lines changed

.github/workflows/lint-test.yml

+9-6
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,24 @@ jobs:
1515
name: Lint
1616
runs-on: ubuntu-latest
1717
steps:
18-
- uses: actions/checkout@v2
18+
- uses: actions/checkout@v3
19+
- uses: actions/setup-go@v3
20+
with:
21+
go-version: '^1.18'
1922
- name: golangci-lint
20-
uses: golangci/golangci-lint-action@v2
23+
uses: golangci/golangci-lint-action@v3
2124
with:
22-
version: v1.29
25+
version: v1.46.2
2326
test:
2427
name: Test
2528
runs-on: ubuntu-latest
2629
steps:
2730
- name: Install Go
28-
uses: actions/setup-go@v2
31+
uses: actions/setup-go@v3
2932
with:
30-
go-version: 1.17.x
33+
go-version: 1.18.x
3134
- name: Checkout code
32-
uses: actions/checkout@v2
35+
uses: actions/checkout@v3
3336
- uses: actions/cache@v2
3437
with:
3538
# In order:

go.mod

+14-12
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,30 @@
11
module github.com/moshebe/gtrace
22

3-
go 1.17
3+
go 1.18
44

55
require (
66
cloud.google.com/go/trace v1.2.0
7-
github.com/urfave/cli/v2 v2.4.0
8-
google.golang.org/api v0.74.0
9-
google.golang.org/genproto v0.0.0-20220407144326-9054f6ed7bac
7+
github.com/urfave/cli/v2 v2.11.1
8+
google.golang.org/api v0.88.0
9+
google.golang.org/genproto v0.0.0-20220720214146-176da50484ac
1010
google.golang.org/protobuf v1.28.0
1111
)
1212

1313
require (
14-
cloud.google.com/go/compute v1.5.0 // indirect
15-
github.com/cpuguy83/go-md2man/v2 v2.0.1 // indirect
14+
cloud.google.com/go/compute v1.7.0 // indirect
15+
github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
1616
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
1717
github.com/golang/protobuf v1.5.2 // indirect
18-
github.com/google/go-cmp v0.5.7 // indirect
19-
github.com/googleapis/gax-go/v2 v2.2.0 // indirect
18+
github.com/google/go-cmp v0.5.8 // indirect
19+
github.com/googleapis/enterprise-certificate-proxy v0.1.0 // indirect
20+
github.com/googleapis/gax-go/v2 v2.4.0 // indirect
2021
github.com/russross/blackfriday/v2 v2.1.0 // indirect
22+
github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
2123
go.opencensus.io v0.23.0 // indirect
22-
golang.org/x/net v0.0.0-20220407224826-aac1ed45d8e3 // indirect
23-
golang.org/x/oauth2 v0.0.0-20220309155454-6242fa91716a // indirect
24-
golang.org/x/sys v0.0.0-20220408201424-a24fb2fb8a0f // indirect
24+
golang.org/x/net v0.0.0-20220708220712-1185a9018129 // indirect
25+
golang.org/x/oauth2 v0.0.0-20220718184931-c8730f7fcb92 // indirect
26+
golang.org/x/sys v0.0.0-20220721230656-c6bc011c0c49 // indirect
2527
golang.org/x/text v0.3.7 // indirect
2628
google.golang.org/appengine v1.6.7 // indirect
27-
google.golang.org/grpc v1.45.0 // indirect
29+
google.golang.org/grpc v1.48.0 // indirect
2830
)

0 commit comments

Comments
 (0)