Skip to content

Commit 8c85fbb

Browse files
kylecarbskylecarbs
committed
Merge branch 'main' into vscmd
2 parents 295f2ab + eb60692 commit 8c85fbb

File tree

186 files changed

+8996
-2343
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

186 files changed

+8996
-2343
lines changed

‎.github/workflows/coder.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -172,14 +172,14 @@ jobs:
172172
key: ${{ runner.os }}-go-mod-${{ hashFiles('**/go.sum') }}
173173

174174
- name: Install goreleaser
175-
uses: jaxxstorm/action-install-gh-release@v1.4.0
175+
uses: jaxxstorm/action-install-gh-release@v1.5.0
176176
env:
177177
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
178178
with:
179179
repo: gotestyourself/gotestsum
180180
tag: v1.7.0
181181

182-
- uses: hashicorp/setup-terraform@v1
182+
- uses: hashicorp/setup-terraform@v2
183183
with:
184184
terraform_version: 1.1.2
185185
terraform_wrapper: false
@@ -241,14 +241,14 @@ jobs:
241241
key: ${{ runner.os }}-go-mod-${{ hashFiles('**/go.sum') }}
242242

243243
- name: Install goreleaser
244-
uses: jaxxstorm/action-install-gh-release@v1.4.0
244+
uses: jaxxstorm/action-install-gh-release@v1.5.0
245245
env:
246246
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
247247
with:
248248
repo: gotestyourself/gotestsum
249249
tag: v1.7.0
250250

251-
- uses: hashicorp/setup-terraform@v1
251+
- uses: hashicorp/setup-terraform@v2
252252
with:
253253
terraform_version: 1.1.2
254254
terraform_wrapper: false
@@ -449,7 +449,7 @@ jobs:
449449
with:
450450
go-version: "~1.18"
451451

452-
- uses: hashicorp/setup-terraform@v1
452+
- uses: hashicorp/setup-terraform@v2
453453
with:
454454
terraform_version: 1.1.2
455455
terraform_wrapper: false

‎.goreleaser.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ builds:
2929
- id: coder-slim
3030
dir: cmd/coder
3131
ldflags:
32-
["-s -w -X github.com/coder/coder/cli/buildinfo.tag={{ .Version }}"]
32+
["-s -w -X github.com/coder/coder/buildinfo.tag={{ .Version }}"]
3333
env: [CGO_ENABLED=0]
3434
goos: [darwin, linux, windows]
3535
goarch: [amd64]
@@ -42,7 +42,7 @@ builds:
4242
dir: cmd/coder
4343
flags: [-tags=embed]
4444
ldflags:
45-
["-s -w -X github.com/coder/coder/cli/buildinfo.tag={{ .Version }}"]
45+
["-s -w -X github.com/coder/coder/buildinfo.tag={{ .Version }}"]
4646
env: [CGO_ENABLED=0]
4747
goos: [linux]
4848
goarch: [amd64, arm64]
@@ -51,7 +51,7 @@ builds:
5151
dir: cmd/coder
5252
flags: [-tags=embed]
5353
ldflags:
54-
["-s -w -X github.com/coder/coder/cli/buildinfo.tag={{ .Version }}"]
54+
["-s -w -X github.com/coder/coder/buildinfo.tag={{ .Version }}"]
5555
env: [CGO_ENABLED=0]
5656
goos: [windows]
5757
goarch: [amd64, arm64]
@@ -60,7 +60,7 @@ builds:
6060
dir: cmd/coder
6161
flags: [-tags=embed]
6262
ldflags:
63-
["-s -w -X github.com/coder/coder/cli/buildinfo.tag={{ .Version }}"]
63+
["-s -w -X github.com/coder/coder/buildinfo.tag={{ .Version }}"]
6464
env: [CGO_ENABLED=0]
6565
goos: [darwin]
6666
goarch: [amd64, arm64]

‎.vscode/settings.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"cSpell.words": [
3+
"circbuf",
34
"cliflag",
45
"cliui",
56
"coderd",
@@ -16,6 +17,7 @@
1617
"gographviz",
1718
"goleak",
1819
"gossh",
20+
"gsyslog",
1921
"hashicorp",
2022
"hclsyntax",
2123
"httpmw",
@@ -35,6 +37,7 @@
3537
"nolint",
3638
"nosec",
3739
"ntqry",
40+
"OIDC",
3841
"oneof",
3942
"parameterscopeid",
4043
"pqtype",
@@ -45,7 +48,9 @@
4548
"ptty",
4649
"ptytest",
4750
"retrier",
51+
"rpty",
4852
"sdkproto",
53+
"Signup",
4954
"stretchr",
5055
"TCGETS",
5156
"tcpip",
@@ -57,8 +62,10 @@
5762
"unconvert",
5863
"Untar",
5964
"VMID",
65+
"weblinks",
6066
"webrtc",
6167
"xerrors",
68+
"xstate",
6269
"yamux"
6370
],
6471
"emeraldwalk.runonsave": {

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ fmt: fmt/prettier fmt/terraform
4343
gen: coderd/database/generate peerbroker/proto provisionersdk/proto provisionerd/proto apitypings/generate
4444
.PHONY: gen
4545

46-
install: bin
46+
install: build
4747
@echo "--- Copying from bin to $(INSTALL_DIR)"
4848
cp -r ./dist/coder-$(GOOS)_$(GOOS)_$(GOARCH)*/* $(INSTALL_DIR)
4949
@echo "-- CLI available at $(shell ls $(INSTALL_DIR)/coder*)"

0 commit comments

Comments
 (0)