Skip to content

Commit 6f1e127

Browse files
deansheatherdeansheather
committed
Merge branch 'main' into dean/hang-detector
2 parents 590f76a + a47a9b1 commit 6f1e127

File tree

369 files changed

+11237
-6654
lines changed

Some content is hidden

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

369 files changed

+11237
-6654
lines changed

‎.github/workflows/ci.yaml

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -188,12 +188,19 @@ jobs:
188188
steps:
189189
- name: Checkout
190190
uses: actions/checkout@v3
191+
192+
- uses: buildjet/setup-node@v3
191193
with:
192-
fetch-depth: 0
193-
submodules: true
194+
node-version: 16.16.0
194195

195-
- uses: ./.github/actions/setup-node
196-
- uses: ./.github/actions/setup-go
196+
- uses: buildjet/setup-go@v4
197+
with:
198+
# This doesn't need caching. It's super fast anyways!
199+
cache: false
200+
go-version: 1.20.5
201+
202+
- name: Install prettier
203+
run: npm install -g prettier
197204

198205
- name: Install shfmt
199206
run: go install mvdan.cc/sh/v3/cmd/shfmt@v3.5.0

‎.vscode/settings.json

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -212,11 +212,5 @@
212212
// We often use a version of TypeScript that's ahead of the version shipped
213213
// with VS Code.
214214
"typescript.tsdk": "./site/node_modules/typescript/lib",
215-
"grammarly.selectors": [
216-
{
217-
"language": "markdown",
218-
"scheme": "file",
219-
"pattern": "docs/contributing/frontend.md"
220-
}
221-
]
215+
"prettier.prettierPath": "./node_modules/prettier"
222216
}

‎Makefile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,9 @@ endif
5252
FIND_EXCLUSIONS= \
5353
-not \( \( -path '*/.git/*' -o -path './build/*' -o -path './vendor/*' -o -path './.coderv2/*' -o -path '*/node_modules/*' -o -path './site/out/*' -o -path './coderd/apidoc/*' \) -prune \)
5454
# Source files used for make targets, evaluated on use.
55-
GO_SRC_FILES = $(shell find . $(FIND_EXCLUSIONS) -type f -name '*.go')
55+
GO_SRC_FILES := $(shell find . $(FIND_EXCLUSIONS) -type f -name '*.go')
5656
# All the shell files in the repo, excluding ignored files.
57-
SHELL_SRC_FILES = $(shell find . $(FIND_EXCLUSIONS) -type f -name '*.sh')
57+
SHELL_SRC_FILES := $(shell find . $(FIND_EXCLUSIONS) -type f -name '*.sh')
5858

5959
# All ${OS}_${ARCH} combos we build for. Windows binaries have the .exe suffix.
6060
OS_ARCHES := \
@@ -431,7 +431,7 @@ lint/helm:
431431
gen: \
432432
coderd/database/dump.sql \
433433
coderd/database/querier.go \
434-
coderd/database/dbmock/store.go \
434+
coderd/database/dbmock/dbmock.go \
435435
provisionersdk/proto/provisioner.pb.go \
436436
provisionerd/proto/provisionerd.pb.go \
437437
site/src/api/typesGenerated.ts \
@@ -453,7 +453,7 @@ gen/mark-fresh:
453453
files="\
454454
coderd/database/dump.sql \
455455
coderd/database/querier.go \
456-
coderd/database/dbmock/store.go \
456+
coderd/database/dbmock/dbmock.go \
457457
provisionersdk/proto/provisioner.pb.go \
458458
provisionerd/proto/provisionerd.pb.go \
459459
site/src/api/typesGenerated.ts \
@@ -490,7 +490,7 @@ coderd/database/querier.go: coderd/database/sqlc.yaml coderd/database/dump.sql $
490490
./coderd/database/generate.sh
491491

492492

493-
coderd/database/dbmock/store.go: coderd/database/db.go coderd/database/querier.go
493+
coderd/database/dbmock/dbmock.go: coderd/database/db.go coderd/database/querier.go
494494
go generate ./coderd/database/dbmock/
495495

496496
provisionersdk/proto/provisioner.pb.go: provisionersdk/proto/provisioner.proto

0 commit comments

Comments
 (0)