Skip to content

Commit da0ddda

Browse files
kylecarbskylecarbs
committed
Merge branch 'main' into licensestyle
2 parents 20c3d7e + 6bb4a4c commit da0ddda

File tree

494 files changed

+8490
-4877
lines changed

Some content is hidden

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

494 files changed

+8490
-4877
lines changed

‎.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ site/e2e/test-results/*
2929
site/e2e/states/*.json
3030
site/playwright-report/*
3131
site/.swc
32+
site/dist/
3233

3334
# Make target for updating golden files (any dir).
3435
.gen-golden
@@ -52,3 +53,4 @@ site/stats/
5253

5354
# direnv
5455
.envrc
56+
*.test

‎.prettierignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ site/e2e/test-results/*
3232
site/e2e/states/*.json
3333
site/playwright-report/*
3434
site/.swc
35+
site/dist/
3536

3637
# Make target for updating golden files (any dir).
3738
.gen-golden
@@ -55,6 +56,7 @@ site/stats/
5556

5657
# direnv
5758
.envrc
59+
*.test
5860
# .prettierignore.include:
5961
# Helm templates contain variables that are invalid YAML and can't be formatted
6062
# by Prettier.

‎.vscode/settings.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020
"codersdk",
2121
"cronstrue",
2222
"databasefake",
23+
"dbfake",
24+
"dbgen",
2325
"dbtype",
2426
"DERP",
2527
"derphttp",
@@ -34,6 +36,7 @@
3436
"Dsts",
3537
"embeddedpostgres",
3638
"enablements",
39+
"enterprisemeta",
3740
"errgroup",
3841
"eventsourcemock",
3942
"Failf",

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -526,7 +526,7 @@ cli/testdata/.gen-golden: $(wildcard cli/testdata/*.golden) $(wildcard cli/*.tpl
526526
go test ./cli -run="Test(CommandHelp|ServerYAML)" -update
527527
touch "$@"
528528

529-
helm/tests/testdata/.gen-golden: $(wildcard helm/tests/testdata/*.golden) $(GO_SRC_FILES)
529+
helm/tests/testdata/.gen-golden: $(wildcard helm/tests/testdata/*.yaml) $(wildcard helm/tests/testdata/*.golden) $(GO_SRC_FILES)
530530
go test ./helm/tests -run=TestUpdateGoldenFiles -update
531531
touch "$@"
532532

‎cli/root.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -87,11 +87,13 @@ func (r *RootCmd) Core() []*clibase.Cmd {
8787

8888
// Workspace Commands
8989
r.configSSH(),
90-
r.rename(),
91-
r.ping(),
9290
r.create(),
9391
r.deleteWorkspace(),
9492
r.list(),
93+
r.parameters(),
94+
r.ping(),
95+
r.rename(),
96+
r.scaletest(),
9597
r.schedules(),
9698
r.show(),
9799
r.speedtest(),
@@ -100,13 +102,11 @@ func (r *RootCmd) Core() []*clibase.Cmd {
100102
r.stop(),
101103
r.update(),
102104
r.restart(),
103-
r.parameters(),
104105

105106
// Hidden
106-
r.workspaceAgent(),
107-
r.scaletest(),
108107
r.gitssh(),
109108
r.vscodeSSH(),
109+
r.workspaceAgent(),
110110
}
111111
}
112112

0 commit comments

Comments
 (0)