Skip to content

Commit 2c5f86b

Browse files
sreyasreya
committed
Merge branch 'main' into jon/wsactiondocs
2 parents c459284 + 1ad998e commit 2c5f86b

File tree

301 files changed

+7571
-4970
lines changed

Some content is hidden

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

301 files changed

+7571
-4970
lines changed

‎.github/actions/setup-sqlc/action.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ runs:
55
using: "composite"
66
steps:
77
- name: Setup sqlc
8-
uses: sqlc-dev/setup-sqlc@v3
8+
uses: sqlc-dev/setup-sqlc@v4
99
with:
1010
sqlc-version: "1.20.0"

‎.github/pr-deployments/template/main.tf

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
terraform {
22
required_providers {
33
coder = {
4-
source = "coder/coder"
4+
source = "coder/coder"
55
}
66
kubernetes = {
7-
source = "hashicorp/kubernetes"
7+
source = "hashicorp/kubernetes"
88
}
99
}
1010
}
@@ -235,6 +235,9 @@ resource "kubernetes_deployment" "main" {
235235
"app.kubernetes.io/name" = "coder-workspace"
236236
}
237237
}
238+
strategy {
239+
type = "Recreate"
240+
}
238241

239242
template {
240243
metadata {

‎.github/workflows/ci.yaml

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ jobs:
136136
137137
# Check for any typos
138138
- name: Check for typos
139-
uses: crate-ci/typos@v1.16.17
139+
uses: crate-ci/typos@v1.16.19
140140
with:
141141
config: .github/workflows/typos.toml
142142

@@ -223,7 +223,7 @@ jobs:
223223
go-version: 1.20.10
224224

225225
- name: Install shfmt
226-
run: go install mvdan.cc/sh/v3/cmd/shfmt@v3.5.0
226+
run: go install mvdan.cc/sh/v3/cmd/shfmt@v3.7.0
227227

228228
- name: make fmt
229229
run: |
@@ -291,14 +291,9 @@ jobs:
291291
gotestsum --junitfile="gotests.xml" --jsonfile="gotests.json" \
292292
--packages="./..." -- $PARALLEL_FLAG -short -failfast $COVERAGE_FLAGS
293293
294-
- name: Print test stats
295-
if: success() || failure()
296-
run: |
297-
# Artifacts are not available after rerunning a job,
298-
# so we need to print the test stats to the log.
299-
go run ./scripts/ci-report/main.go gotests.json | tee gotests_stats.json
300-
301294
- name: Upload test stats to Datadog
295+
timeout-minutes: 1
296+
continue-on-error: true
302297
uses: ./.github/actions/upload-datadog
303298
if: success() || failure()
304299
with:
@@ -343,14 +338,9 @@ jobs:
343338
export TS_DEBUG_DISCO=true
344339
make test-postgres
345340
346-
- name: Print test stats
347-
if: success() || failure()
348-
run: |
349-
# Artifacts are not available after rerunning a job,
350-
# so we need to print the test stats to the log.
351-
go run ./scripts/ci-report/main.go gotests.json | tee gotests_stats.json
352-
353341
- name: Upload test stats to Datadog
342+
timeout-minutes: 1
343+
continue-on-error: true
354344
uses: ./.github/actions/upload-datadog
355345
if: success() || failure()
356346
with:
@@ -391,6 +381,8 @@ jobs:
391381
gotestsum --junitfile="gotests.xml" -- -race ./...
392382
393383
- name: Upload test stats to Datadog
384+
timeout-minutes: 1
385+
continue-on-error: true
394386
uses: ./.github/actions/upload-datadog
395387
if: always()
396388
with:

‎.github/workflows/dogfood.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
echo "tag=${tag}" >> $GITHUB_OUTPUT
3939
4040
- name: Install Nix
41-
uses: DeterminateSystems/nix-installer-action@v5
41+
uses: DeterminateSystems/nix-installer-action@v6
4242

4343
- name: Run the Magic Nix Cache
4444
uses: DeterminateSystems/magic-nix-cache-action@v2

‎Makefile

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -419,7 +419,6 @@ lint: lint/shellcheck lint/go lint/ts lint/helm lint/site-icons
419419

420420
lint/site-icons:
421421
./scripts/check_site_icons.sh
422-
423422
.PHONY: lint/site-icons
424423

425424
lint/ts:
@@ -517,6 +516,8 @@ coderd/database/dump.sql: coderd/database/gen/dump/main.go $(wildcard coderd/dat
517516
go run ./coderd/database/gen/dump/main.go
518517

519518
# Generates Go code for querying the database.
519+
# coderd/database/queries.sql.go
520+
# coderd/database/models.go
520521
coderd/database/querier.go: coderd/database/sqlc.yaml coderd/database/dump.sql $(wildcard coderd/database/queries/*.sql)
521522
./coderd/database/generate.sh
522523

@@ -539,19 +540,18 @@ provisionerd/proto/provisionerd.pb.go: provisionerd/proto/provisionerd.proto
539540
--go-drpc_opt=paths=source_relative \
540541
./provisionerd/proto/provisionerd.proto
541542

542-
site/src/api/typesGenerated.ts: scripts/apitypings/main.go $(shell find ./codersdk $(FIND_EXCLUSIONS) -type f -name '*.go')
543-
go run ./scripts/apitypings/ > site/src/api/typesGenerated.ts
544-
cd site
545-
pnpm run format:types ./src/api/typesGenerated.ts
543+
site/src/api/typesGenerated.ts: $(wildcard scripts/apitypings/*) $(shell find ./codersdk $(FIND_EXCLUSIONS) -type f -name '*.go')
544+
go run ./scripts/apitypings/ > $@
545+
pnpm run format:write:only "$@"
546546

547547
site/e2e/provisionerGenerated.ts: provisionerd/proto/provisionerd.pb.go provisionersdk/proto/provisioner.pb.go
548548
cd site
549549
../scripts/pnpm_install.sh
550550
pnpm run gen:provisioner
551551

552-
site/src/theme/icons.json: $(wildcard site/static/icon/*)
553-
go run ./scripts/gensite/ -icons $@
554-
pnpm run format:write:only $@
552+
site/src/theme/icons.json: $(wildcard scripts/gensite/*) $(wildcard site/static/icon/*)
553+
go run ./scripts/gensite/ -icons "$@"
554+
pnpm run format:write:only "$@"
555555

556556
examples/examples.gen.json: scripts/examplegen/main.go examples/examples.go $(shell find ./examples/templates)
557557
go run ./scripts/examplegen/main.go > examples/examples.gen.json

0 commit comments

Comments
 (0)