Skip to content

Commit aa75ca0

Browse files
committed
Merge branch 'main' into users-table/presleyp/592
2 parents fa600a5 + 99a685b commit aa75ca0

File tree

4 files changed

+11
-11
lines changed

4 files changed

+11
-11
lines changed

.github/workflows/coder.yaml

+7-7
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
runs-on: ubuntu-latest
3030
steps:
3131
- uses: actions/checkout@v3
32-
- uses: actions/setup-go@v2
32+
- uses: actions/setup-go@v3
3333
with:
3434
go-version: "~1.18"
3535
- name: golangci-lint
@@ -71,7 +71,7 @@ jobs:
7171
uses: arduino/setup-protoc@v1
7272
with:
7373
version: "3.19.4"
74-
- uses: actions/setup-go@v2
74+
- uses: actions/setup-go@v3
7575
with:
7676
go-version: "~1.18"
7777
- run: curl -sSL
@@ -123,7 +123,7 @@ jobs:
123123
steps:
124124
- uses: actions/checkout@v3
125125

126-
- uses: actions/setup-go@v2
126+
- uses: actions/setup-go@v3
127127
with:
128128
go-version: "~1.18"
129129

@@ -191,7 +191,7 @@ jobs:
191191
steps:
192192
- uses: actions/checkout@v3
193193

194-
- uses: actions/setup-go@v2
194+
- uses: actions/setup-go@v3
195195
with:
196196
go-version: "~1.18"
197197

@@ -289,7 +289,7 @@ jobs:
289289
- name: Set up Google Cloud SDK
290290
uses: google-github-actions/setup-gcloud@v0
291291

292-
- uses: actions/setup-go@v2
292+
- uses: actions/setup-go@v3
293293
with:
294294
go-version: "~1.18"
295295

@@ -363,7 +363,7 @@ jobs:
363363
js-${{ runner.os }}-
364364
365365
# Go is required for uploading the test results to datadog
366-
- uses: actions/setup-go@v2
366+
- uses: actions/setup-go@v3
367367
with:
368368
go-version: "~1.18"
369369

@@ -419,7 +419,7 @@ jobs:
419419
js-${{ runner.os }}-
420420
421421
# Go is required for uploading the test results to datadog
422-
- uses: actions/setup-go@v2
422+
- uses: actions/setup-go@v3
423423
with:
424424
go-version: "~1.18"
425425

.github/workflows/release.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
- uses: actions/checkout@v3
1111
with:
1212
fetch-depth: 0
13-
- uses: actions/setup-go@v2
13+
- uses: actions/setup-go@v3
1414
with:
1515
go-version: "~1.18"
1616

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ require (
6262
github.com/hashicorp/yamux v0.0.0-20211028200310-0bc27b27de87
6363
github.com/justinas/nosurf v1.1.1
6464
github.com/kirsle/configdir v0.0.0-20170128060238-e45d2f54772f
65-
github.com/lib/pq v1.10.4
65+
github.com/lib/pq v1.10.5
6666
github.com/manifoldco/promptui v0.9.0
6767
github.com/mattn/go-isatty v0.0.14
6868
github.com/mitchellh/mapstructure v1.4.3

go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -1155,8 +1155,8 @@ github.com/lib/pq v1.3.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
11551155
github.com/lib/pq v1.8.0/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
11561156
github.com/lib/pq v1.10.0/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
11571157
github.com/lib/pq v1.10.2/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
1158-
github.com/lib/pq v1.10.4 h1:SO9z7FRPzA03QhHKJrH5BXA6HU1rS4V2nIVrrNC1iYk=
1159-
github.com/lib/pq v1.10.4/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
1158+
github.com/lib/pq v1.10.5 h1:J+gdV2cUmX7ZqL2B0lFcW0m+egaHC2V3lpO8nWxyYiQ=
1159+
github.com/lib/pq v1.10.5/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
11601160
github.com/lucas-clemente/quic-go v0.25.1-0.20220307142123-ad1cb27c1b64 h1:Jm4MidwZYa0G6/2lgwt5xVd+ifcR6MnB/Og/6LqgaYI=
11611161
github.com/lucas-clemente/quic-go v0.25.1-0.20220307142123-ad1cb27c1b64/go.mod h1:YtzP8bxRVCBlO77yRanE264+fY/T2U9ZlW1AaHOsMOg=
11621162
github.com/lucasb-eyer/go-colorful v1.0.2/go.mod h1:0MS4r+7BZKSJ5mw4/S5MPN+qHFF1fYclkSPilDOKW0s=

0 commit comments

Comments
 (0)