Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit beef011

Browse files
greyscaledgreyscaled
committed
Merge origin/main
2 parents 2dac972 + 43d433c commit beef011

File tree

6 files changed

+29
-26
lines changed

6 files changed

+29
-26
lines changed

‎.github/workflows/coder-test-stability.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,13 @@ jobs:
3939
- 1
4040
- 2
4141
steps:
42-
- uses: actions/checkout@v2
42+
- uses: actions/checkout@v3
4343

4444
- uses: actions/setup-go@v2
4545
with:
4646
go-version: "^1.17"
4747

48-
- uses: actions/cache@v2
48+
- uses: actions/cache@v3
4949
with:
5050
# Go mod cache, Linux build cache, Mac build cache, Windows build cache
5151
path: |

‎.github/workflows/coder.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555

5656
- name: Cache Node
5757
id: cache-node
58-
uses: actions/cache@v2
58+
uses: actions/cache@v3
5959
with:
6060
path: |
6161
**/node_modules
@@ -104,7 +104,7 @@ jobs:
104104

105105
- name: Cache Node
106106
id: cache-node
107-
uses: actions/cache@v2
107+
uses: actions/cache@v3
108108
with:
109109
path: |
110110
**/node_modules
@@ -135,7 +135,7 @@ jobs:
135135
with:
136136
go-version: "^1.17"
137137

138-
- uses: actions/cache@v2
138+
- uses: actions/cache@v3
139139
with:
140140
# Go mod cache, Linux build cache, Mac build cache, Windows build cache
141141
path: |
@@ -248,7 +248,7 @@ jobs:
248248

249249
- name: Cache Node
250250
id: cache-node
251-
uses: actions/cache@v2
251+
uses: actions/cache@v3
252252
with:
253253
path: |
254254
**/node_modules
@@ -308,11 +308,11 @@ jobs:
308308
# https://github.com/coder/coder/issues/384
309309
# - windows-2022
310310
steps:
311-
- uses: actions/checkout@v2
311+
- uses: actions/checkout@v3
312312

313313
- name: Cache Node
314314
id: cache-node
315-
uses: actions/cache@v2
315+
uses: actions/cache@v3
316316
with:
317317
path: |
318318
**/node_modules
@@ -339,7 +339,7 @@ jobs:
339339
with:
340340
install-only: true
341341

342-
- uses: actions/cache@v2
342+
- uses: actions/cache@v3
343343
with:
344344
# Go mod cache, Linux build cache, Mac build cache, Windows build cache
345345
path: |

‎.vscode/settings.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,8 @@
6161
"files.exclude": {
6262
"**/node_modules": true
6363
},
64+
// Ensure files always have a newline.
65+
"files.insertFinalNewline": true,
6466
"go.lintTool": "golangci-lint",
6567
"go.lintFlags": ["--fast"],
6668
"go.lintOnSave": "package",
@@ -79,5 +81,5 @@
7981
},
8082
// We often use a version of TypeScript that's ahead of the version shipped
8183
// with VS Code.
82-
"typescript.tsdk": "./site/node_modules/typescript/lib"
84+
"typescript.tsdk": "./site/node_modules/typescript/lib",
8385
}

‎Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ gen: database/generate peerbroker/proto provisionersdk/proto provisionerd/proto
5151

5252
install: bin
5353
@echo "--- Copying from bin to $(INSTALL_DIR)"
54-
cp -r ./dist/coder_$(GOOS)_$(GOARCH) $(INSTALL_DIR)
54+
cp -r ./dist/coder_$(GOOS)_$(GOARCH)/* $(INSTALL_DIR)
5555
@echo "-- CLI available at $(shell ls $(INSTALL_DIR)/coder*)"
5656
.PHONY: install
5757

@@ -92,4 +92,4 @@ site/out:
9292

9393
snapshot:
9494
goreleaser release --snapshot --rm-dist
95-
.PHONY: snapshot
95+
.PHONY: snapshot

‎go.mod

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,10 @@ require (
4747
github.com/pion/datachannel v1.5.2
4848
github.com/pion/logging v0.2.2
4949
github.com/pion/transport v0.13.0
50-
github.com/pion/webrtc/v3 v3.1.25
50+
github.com/pion/webrtc/v3 v3.1.26
5151
github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8
5252
github.com/powersj/whatsthis v1.3.0
53-
github.com/quasilyte/go-ruleguard/dsl v0.3.17
53+
github.com/quasilyte/go-ruleguard/dsl v0.3.18
5454
github.com/spf13/cobra v1.4.0
5555
github.com/stretchr/testify v1.7.1
5656
github.com/tabbed/pqtype v0.1.1
@@ -63,9 +63,9 @@ require (
6363
golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5
6464
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1
6565
google.golang.org/api v0.73.0
66-
google.golang.org/protobuf v1.27.1
66+
google.golang.org/protobuf v1.28.0
6767
nhooyr.io/websocket v1.8.7
68-
storj.io/drpc v0.0.29
68+
storj.io/drpc v0.0.30
6969
)
7070

7171
require (
@@ -116,7 +116,7 @@ require (
116116
github.com/pion/mdns v0.0.5 // indirect
117117
github.com/pion/randutil v0.1.0 // indirect
118118
github.com/pion/rtcp v1.2.9 // indirect
119-
github.com/pion/rtp v1.7.7 // indirect
119+
github.com/pion/rtp v1.7.9 // indirect
120120
github.com/pion/sctp v1.8.2 // indirect
121121
github.com/pion/sdp/v3 v3.0.4 // indirect
122122
github.com/pion/srtp/v2 v2.0.5 // indirect

‎go.sum

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1022,8 +1022,8 @@ github.com/pion/rtcp v1.2.9 h1:1ujStwg++IOLIEoOiIQ2s+qBuJ1VN81KW+9pMPsif+U=
10221022
github.com/pion/rtcp v1.2.9/go.mod h1:qVPhiCzAm4D/rxb6XzKeyZiQK69yJpbUDJSF7TgrqNo=
10231023
github.com/pion/rtp v1.7.0/go.mod h1:bDb5n+BFZxXx0Ea7E5qe+klMuqiBrP+w8XSjiWtCUko=
10241024
github.com/pion/rtp v1.7.4/go.mod h1:bDb5n+BFZxXx0Ea7E5qe+klMuqiBrP+w8XSjiWtCUko=
1025-
github.com/pion/rtp v1.7.7 h1:MzaAfCVicTVxiZpM2o99+YFrKxyRsQ38nnIi4vJPuUY=
1026-
github.com/pion/rtp v1.7.7/go.mod h1:bDb5n+BFZxXx0Ea7E5qe+klMuqiBrP+w8XSjiWtCUko=
1025+
github.com/pion/rtp v1.7.9 h1:17W5Mt2IM3MVfOh7yRfzXbbKXYzBZxV8eG4KKAy+0bg=
1026+
github.com/pion/rtp v1.7.9/go.mod h1:bDb5n+BFZxXx0Ea7E5qe+klMuqiBrP+w8XSjiWtCUko=
10271027
github.com/pion/sctp v1.8.0/go.mod h1:xFe9cLMZ5Vj6eOzpyiKjT9SwGM4KpK/8Jbw5//jc+0s=
10281028
github.com/pion/sctp v1.8.2 h1:yBBCIrUMJ4yFICL3RIvR4eh/H2BTTvlligmSTy+3kiA=
10291029
github.com/pion/sctp v1.8.2/go.mod h1:xFe9cLMZ5Vj6eOzpyiKjT9SwGM4KpK/8Jbw5//jc+0s=
@@ -1041,8 +1041,8 @@ github.com/pion/turn/v2 v2.0.8 h1:KEstL92OUN3k5k8qxsXHpr7WWfrdp7iJZHx99ud8muw=
10411041
github.com/pion/turn/v2 v2.0.8/go.mod h1:+y7xl719J8bAEVpSXBXvTxStjJv3hbz9YFflvkpcGPw=
10421042
github.com/pion/udp v0.1.1 h1:8UAPvyqmsxK8oOjloDk4wUt63TzFe9WEJkg5lChlj7o=
10431043
github.com/pion/udp v0.1.1/go.mod h1:6AFo+CMdKQm7UiA0eUPA8/eVCTx8jBIITLZHc9DWX5M=
1044-
github.com/pion/webrtc/v3 v3.1.25 h1:8bTa2lLI5rszkKCKVO6L9VlKhhmmwMXZ/beSWLwQK14=
1045-
github.com/pion/webrtc/v3 v3.1.25/go.mod h1:BA9hvF1mCu64w/to7nHrSNMxx+zMqVst990zA7xgfCM=
1044+
github.com/pion/webrtc/v3 v3.1.26 h1:KoPw7WtAn+fzozHm/E08qnjSAkHCBlGm4R0DLyPHKYc=
1045+
github.com/pion/webrtc/v3 v3.1.26/go.mod h1:hdduI+Rx0cpGvva18j0gKy/Iak611WPyhUIXs5W/FuI=
10461046
github.com/pkg/browser v0.0.0-20210706143420-7d21f8c997e2/go.mod h1:HKlIX3XHQyzLZPlr7++PzdhaXEj94dEiJgZDTsxEqUI=
10471047
github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 h1:KoWmjvw+nsYOo29YJK9vDA65RGE3NrOnUtO7a+RF9HU=
10481048
github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8/go.mod h1:HKlIX3XHQyzLZPlr7++PzdhaXEj94dEiJgZDTsxEqUI=
@@ -1087,8 +1087,8 @@ github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4O
10871087
github.com/prometheus/procfs v0.2.0/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
10881088
github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
10891089
github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
1090-
github.com/quasilyte/go-ruleguard/dsl v0.3.17 h1:L5xf3nifnRIdYe9vyMuY2sDnZHIgQol/fDq74FQz7ZY=
1091-
github.com/quasilyte/go-ruleguard/dsl v0.3.17/go.mod h1:KeCP03KrjuSO0H1kTuZQCWlQPulDV6YMIXmpQss17rU=
1090+
github.com/quasilyte/go-ruleguard/dsl v0.3.18 h1:gzHcFxmTwhn+ZKZd6nGw7JyjoDcYuwcA+TY5MNn9oMk=
1091+
github.com/quasilyte/go-ruleguard/dsl v0.3.18/go.mod h1:KeCP03KrjuSO0H1kTuZQCWlQPulDV6YMIXmpQss17rU=
10921092
github.com/remyoudompheng/bigfft v0.0.0-20190728182440-6a916e37a237/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
10931093
github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
10941094
github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
@@ -1829,8 +1829,9 @@ google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGj
18291829
google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
18301830
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
18311831
google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
1832-
google.golang.org/protobuf v1.27.1 h1:SnqbnDw1V7RiZcXPx5MEeqPv2s79L9i7BJUlG/+RurQ=
18331832
google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
1833+
google.golang.org/protobuf v1.28.0 h1:w43yiav+6bVFTBQFZX0r7ipe9JQ1QsbMgHwbBziscLw=
1834+
google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
18341835
gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod h1:/h5ZAUhDkGaJfjzjKLSjv6zCL6O0LLBxU4K+aSYdM/U=
18351836
gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
18361837
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
@@ -1947,5 +1948,5 @@ sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK
19471948
sigs.k8s.io/structured-merge-diff/v4 v4.0.3/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw=
19481949
sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=
19491950
sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=
1950-
storj.io/drpc v0.0.29 h1:Ihd4ls/JQFr0lctefie3iu+3QM4duccCKr9uMzf4sKY=
1951-
storj.io/drpc v0.0.29/go.mod h1:6rcOyR/QQkSTX/9L5ZGtlZaE2PtXTTZl8d+ulSeeYEg=
1951+
storj.io/drpc v0.0.30 h1:jqPe4T9KEu3CDBI05A2hCMgMSHLtd/E0N0yTF9QreIE=
1952+
storj.io/drpc v0.0.30/go.mod h1:6rcOyR/QQkSTX/9L5ZGtlZaE2PtXTTZl8d+ulSeeYEg=

0 commit comments

Comments
 (0)