Skip to content

Commit 6d7ef9f

Browse files
ParkreinerParkreiner
committed
Merge branch 'main' into mes/hook-test-revamps-4
2 parents ec3ba4f + af4d0b1 commit 6d7ef9f

File tree

410 files changed

+22558
-10632
lines changed

Some content is hidden

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

410 files changed

+22558
-10632
lines changed

‎.gitattributes

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,12 @@ coderd/apidoc/swagger.json linguist-generated=true
66
coderd/database/dump.sql linguist-generated=true
77
peerbroker/proto/*.go linguist-generated=true
88
provisionerd/proto/*.go linguist-generated=true
9+
provisionerd/proto/version.go linguist-generated=false
910
provisionersdk/proto/*.go linguist-generated=true
1011
*.tfplan.json linguist-generated=true
1112
*.tfstate.json linguist-generated=true
1213
*.tfstate.dot linguist-generated=true
1314
*.tfplan.dot linguist-generated=true
15+
site/e2e/provisionerGenerated.ts linguist-generated=true
1416
site/src/api/typesGenerated.ts linguist-generated=true
1517
site/src/pages/SetupPage/countries.tsx linguist-generated=true

‎.github/fly-wsproxies/paris-coder.toml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,12 @@ primary_region = "cdg"
2222
auto_start_machines = true
2323
min_machines_running = 0
2424

25+
# Ref: https://fly.io/docs/reference/configuration/#http_service-concurrency
26+
[http_service.concurrency]
27+
type = "requests"
28+
soft_limit = 50
29+
hard_limit = 100
30+
2531
[[vm]]
2632
cpu_kind = "shared"
2733
cpus = 2

‎.github/fly-wsproxies/sao-paulo-coder.toml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,12 @@ primary_region = "gru"
2222
auto_start_machines = true
2323
min_machines_running = 0
2424

25+
# Ref: https://fly.io/docs/reference/configuration/#http_service-concurrency
26+
[http_service.concurrency]
27+
type = "requests"
28+
soft_limit = 50
29+
hard_limit = 100
30+
2531
[[vm]]
2632
cpu_kind = "shared"
2733
cpus = 2

‎.github/fly-wsproxies/sydney-coder.toml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,12 @@ primary_region = "syd"
2222
auto_start_machines = true
2323
min_machines_running = 0
2424

25+
# Ref: https://fly.io/docs/reference/configuration/#http_service-concurrency
26+
[http_service.concurrency]
27+
type = "requests"
28+
soft_limit = 50
29+
hard_limit = 100
30+
2531
[[vm]]
2632
cpu_kind = "shared"
2733
cpus = 2

‎.github/workflows/ci.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,8 @@ jobs:
126126

127127
- name: Get golangci-lint cache dir
128128
run: |
129-
go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.53.2
129+
linter_ver=$(egrep -o 'GOLANGCI_LINT_VERSION=\S+' dogfood/Dockerfile | cut -d '=' -f 2)
130+
go install github.com/golangci/golangci-lint/cmd/golangci-lint@v$linter_ver
130131
dir=$(golangci-lint cache status | awk '/Dir/ { print $2 }')
131132
echo "LINT_CACHE_DIR=$dir" >> $GITHUB_ENV
132133

‎.vscode/settings.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,7 @@
114114
"Signup",
115115
"slogtest",
116116
"sourcemapped",
117+
"spinbutton",
117118
"Srcs",
118119
"stdbuf",
119120
"stretchr",

‎Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -361,6 +361,8 @@ $(foreach chart,$(charts),build/$(chart)_helm_$(VERSION).tgz): build/%_helm_$(VE
361361

362362
site/out/index.html: site/package.json $(shell find ./site $(FIND_EXCLUSIONS) -type f \( -name '*.ts' -o -name '*.tsx' \))
363363
cd site
364+
# prevents this directory from getting to big, and causing "too much data" errors
365+
rm -rf out/assets/
364366
../scripts/pnpm_install.sh
365367
pnpm build
366368

0 commit comments

Comments
 (0)