Skip to content

Commit e3cf488

Browse files
kylecarbskylecarbs
committed
Merge branch 'main' into devurls
2 parents 8b2f6c4 + b0d5203 commit e3cf488

File tree

372 files changed

+15375
-31118
lines changed

Some content is hidden

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

372 files changed

+15375
-31118
lines changed

‎.github/CODEOWNERS

-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
11
site/ @coder/frontend
2-
site/src/xServices @presleyp

‎.github/workflows/coder.yaml

+20-17
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
with:
4141
go-version: "~1.18"
4242
- name: golangci-lint
43-
uses: golangci/golangci-lint-action@v3.1.0
43+
uses: golangci/golangci-lint-action@v3.2.0
4444
with:
4545
version: v1.46.0
4646

@@ -105,7 +105,7 @@ jobs:
105105
- run: go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.26
106106
- run: go install storj.io/drpc/cmd/protoc-gen-go-drpc@v0.0.26
107107
- run: go install golang.org/x/tools/cmd/goimports@latest
108-
- run: "make --output-sync -j gen"
108+
- run: "make --output-sync -j -B gen"
109109
- run: ./scripts/check_unstaged.sh
110110

111111
style-fmt:
@@ -133,8 +133,7 @@ jobs:
133133
- name: Install node_modules
134134
run: ./scripts/yarn_install.sh
135135

136-
- name: "make fmt"
137-
run: "make --output-sync -j fmt"
136+
- run: "make --output-sync -j -B fmt"
138137

139138
test-go:
140139
name: "test/go"
@@ -172,7 +171,7 @@ jobs:
172171
key: ${{ runner.os }}-go-mod-${{ hashFiles('**/go.sum') }}
173172

174173
- name: Install goreleaser
175-
uses: jaxxstorm/action-install-gh-release@v1.5.0
174+
uses: jaxxstorm/action-install-gh-release@v1.7.1
176175
env:
177176
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
178177
with:
@@ -241,7 +240,7 @@ jobs:
241240
key: ${{ runner.os }}-go-mod-${{ hashFiles('**/go.sum') }}
242241

243242
- name: Install goreleaser
244-
uses: jaxxstorm/action-install-gh-release@v1.5.0
243+
uses: jaxxstorm/action-install-gh-release@v1.7.1
245244
env:
246245
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
247246
with:
@@ -276,10 +275,7 @@ jobs:
276275
done
277276
278277
- name: Test with PostgreSQL Database
279-
run: DB=ci gotestsum --junitfile="gotests.xml" --packages="./..." --
280-
-covermode=atomic -coverprofile="gotests.coverage" -timeout=3m
281-
-coverpkg=./...,github.com/coder/coder/codersdk
282-
-count=1 -parallel=2 -race -failfast
278+
run: "make test-postgres"
283279

284280
- name: Upload DataDog Trace
285281
if: always() && github.actor != 'dependabot[bot]' && !github.event.pull_request.head.repo.fork
@@ -339,7 +335,7 @@ jobs:
339335
path: ${{ steps.go-cache-paths.outputs.go-mod }}
340336
key: ${{ runner.os }}-release-go-mod-${{ hashFiles('**/go.sum') }}
341337

342-
- uses: goreleaser/goreleaser-action@v2
338+
- uses: goreleaser/goreleaser-action@v3
343339
with:
344340
install-only: true
345341

@@ -355,18 +351,25 @@ jobs:
355351
js-${{ runner.os }}-
356352
357353
- name: Build site
358-
run: make site/out/index.html
354+
run: make -B site/out/index.html
359355

360356
- name: Build Release
361-
uses: goreleaser/goreleaser-action@v2.9.1
357+
uses: goreleaser/goreleaser-action@v3
362358
with:
363359
version: latest
364360
args: release --snapshot --rm-dist --skip-sign
365361

366362
- uses: actions/upload-artifact@v3
367363
with:
368-
name: coder_linux_amd64.deb
369-
path: ./dist/coder_*_linux_amd64.deb
364+
name: coder_windows_amd64.zip
365+
path: ./dist/coder_*_windows_amd64.zip
366+
retention-days: 7
367+
368+
- uses: actions/upload-artifact@v3
369+
with:
370+
name: coder_linux_amd64.tar.gz
371+
path: ./dist/coder_*_linux_amd64.tar.gz
372+
retention-days: 7
370373

371374
- name: Install Release
372375
run: |
@@ -464,7 +467,7 @@ jobs:
464467
with:
465468
node-version: "14"
466469

467-
- uses: goreleaser/goreleaser-action@v2
470+
- uses: goreleaser/goreleaser-action@v3
468471
with:
469472
install-only: true
470473

@@ -488,7 +491,7 @@ jobs:
488491

489492
- name: Build
490493
run: |
491-
make site/out/index.html
494+
make -B site/out/index.html
492495
493496
- run: yarn playwright:install
494497
working-directory: site

‎.github/workflows/release.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,17 @@ jobs:
1313
DOCKER_CLI_EXPERIMENTAL: "enabled"
1414
steps:
1515
# Docker is not included on macos-latest
16-
- uses: docker-practice/actions-setup-docker@v1.0.8
16+
- uses: docker-practice/actions-setup-docker@1.0.10
1717

1818
- uses: actions/checkout@v3
1919
with:
2020
fetch-depth: 0
2121

2222
- name: Set up QEMU
23-
uses: docker/setup-qemu-action@v1
23+
uses: docker/setup-qemu-action@v2
2424

2525
- name: Docker Login
26-
uses: docker/login-action@v1
26+
uses: docker/login-action@v2
2727
with:
2828
registry: ghcr.io
2929
username: ${{ github.repository_owner }}
@@ -80,7 +80,7 @@ jobs:
8080
run: make site/out/index.html
8181

8282
- name: Run GoReleaser
83-
uses: goreleaser/goreleaser-action@v2.9.1
83+
uses: goreleaser/goreleaser-action@v3
8484
with:
8585
version: latest
8686
args: release --rm-dist

‎.golangci.yaml

+3-1
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ linters-settings:
103103
settings:
104104
ruleguard:
105105
failOn: all
106-
rules: rules.go
106+
rules: '${configDir}/scripts/rules.go'
107107

108108
staticcheck:
109109
# https://staticcheck.io/docs/options#checks
@@ -201,6 +201,8 @@ run:
201201
concurrency: 4
202202
skip-dirs:
203203
- node_modules
204+
skip-files:
205+
- scripts/rules.go
204206
timeout: 5m
205207

206208
# Over time, add more and more linters from

‎.goreleaser.yaml

+4-10
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,15 @@
11
archives:
22
- id: coder-linux
33
builds: [coder-linux]
4-
format: tar
5-
files:
6-
- src: docs/README.md
7-
dst: README.md
4+
format: tar.gz
85

96
- id: coder-darwin
107
builds: [coder-darwin]
118
format: zip
12-
files:
13-
- src: docs/README.md
14-
dst: README.md
159

1610
- id: coder-windows
1711
builds: [coder-windows]
1812
format: zip
19-
files:
20-
- src: docs/README.md
21-
dst: README.md
2213

2314
before:
2415
hooks:
@@ -153,6 +144,9 @@ docker_manifests:
153144

154145
release:
155146
ids: [coder-linux, coder-darwin, coder-windows, packages]
147+
footer: |
148+
## Container Image
149+
- `docker pull ghcr.io/coder/coder:{{ .Tag }}`
156150
157151
signs:
158152
- ids: [coder-darwin]

‎.vscode/settings.json

+12-1
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
{
22
"cSpell.words": [
3+
"buildname",
34
"circbuf",
45
"cliflag",
56
"cliui",
67
"coderd",
78
"coderdtest",
89
"codersdk",
10+
"cronstrue",
911
"devel",
1012
"apps",
1113
"drpc",
@@ -14,13 +16,15 @@
1416
"drpcserver",
1517
"Dsts",
1618
"fatih",
19+
"Formik",
1720
"goarch",
1821
"gographviz",
1922
"goleak",
2023
"gossh",
2124
"gsyslog",
2225
"hashicorp",
2326
"hclsyntax",
27+
"httpapi",
2428
"httpmw",
2529
"idtoken",
2630
"Iflag",
@@ -52,14 +56,17 @@
5256
"rpty",
5357
"sdkproto",
5458
"Signup",
59+
"sourcemapped",
5560
"stretchr",
5661
"TCGETS",
5762
"tcpip",
5863
"TCSETS",
64+
"testid",
5965
"tfexec",
6066
"tfjson",
6167
"tfstate",
6268
"trimprefix",
69+
"typegen",
6370
"unconvert",
6471
"Untar",
6572
"VMID",
@@ -74,6 +81,10 @@
7481
{
7582
"match": "database/queries/*.sql",
7683
"cmd": "make gen"
84+
},
85+
{
86+
"match": "provisionerd/proto/provisionerd.proto",
87+
"cmd": "make provisionerd/proto/provisionerd.pb.go"
7788
}
7889
]
7990
},
@@ -101,5 +112,5 @@
101112
},
102113
// We often use a version of TypeScript that's ahead of the version shipped
103114
// with VS Code.
104-
"typescript.tsdk": "./site/node_modules/typescript/lib",
115+
"typescript.tsdk": "./site/node_modules/typescript/lib"
105116
}

‎Makefile

+33-1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@ coderd/database/dump.sql: $(wildcard coderd/database/migrations/*.sql)
2020
coderd/database/querier.go: coderd/database/dump.sql $(wildcard coderd/database/queries/*.sql)
2121
coderd/database/generate.sh
2222

23+
dev:
24+
./scripts/develop.sh
25+
.PHONY: dev
26+
2327
dist/artifacts.json: site/out/index.html $(shell find . -not -path './vendor/*' -type f -name '*.go') go.mod go.sum
2428
goreleaser release --snapshot --rm-dist --skip-sign
2529

@@ -87,5 +91,33 @@ site/src/api/typesGenerated.ts: scripts/apitypings/main.go $(shell find codersdk
8791
go run scripts/apitypings/main.go > site/src/api/typesGenerated.ts
8892
cd site && yarn run format:types
8993

90-
test:
94+
.PHONY: test
95+
test: test-clean
9196
gotestsum -- -v -short ./...
97+
98+
.PHONY: test-postgres
99+
test-postgres: test-clean
100+
DB=ci gotestsum --junitfile="gotests.xml" --packages="./..." -- \
101+
-covermode=atomic -coverprofile="gotests.coverage" -timeout=5m \
102+
-coverpkg=./...,github.com/coder/coder/codersdk \
103+
-count=1 -parallel=1 -race -failfast
104+
105+
106+
.PHONY: test-postgres-docker
107+
test-postgres-docker:
108+
docker run \
109+
--env POSTGRES_PASSWORD=postgres \
110+
--env POSTGRES_USER=postgres \
111+
--env POSTGRES_DB=postgres \
112+
--env PGDATA=/tmp \
113+
--publish 5432:5432 \
114+
--name test-postgres-docker \
115+
--restart unless-stopped \
116+
--detach \
117+
postgres:11 \
118+
-c shared_buffers=1GB \
119+
-c max_connections=1000
120+
121+
.PHONY: test-clean
122+
test-clean:
123+
go clean -testcache

0 commit comments

Comments
 (0)