Skip to content

Commit 6e4a441

Browse files
deansheatherdeansheather
committed
Merge branch 'main' into buff-makefile
2 parents a6f1b4c + f4a78c9 commit 6e4a441

File tree

176 files changed

+7055
-2846
lines changed

Some content is hidden

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

176 files changed

+7055
-2846
lines changed

‎.github/workflows/dogfood.yaml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,14 @@ jobs:
2121
id: branch-name
2222
uses: tj-actions/branch-names@v5.4
2323

24+
- name: "Branch name to Docker tag name"
25+
id: docker-tag-name
26+
run: |
27+
tag=${{ steps.branch-name.outputs.current_branch }}
28+
# Replace / with --, e.g. user/feature => user--feature.
29+
tag=${tag//\//--}
30+
echo "::set-output name=tag::${tag}"
31+
2432
- name: Set up QEMU
2533
uses: docker/setup-qemu-action@v2
2634

@@ -38,6 +46,6 @@ jobs:
3846
with:
3947
context: "{{defaultContext}}:dogfood"
4048
push: true
41-
tags: "codercom/oss-dogfood:${{ steps.branch-name.outputs.current_branch }},codercom/oss-dogfood:latest"
49+
tags: "codercom/oss-dogfood:${{ steps.docker-tag-name.outputs.tag }},codercom/oss-dogfood:latest"
4250
cache-from: type=registry,ref=codercom/oss-dogfood:latest
4351
cache-to: type=inline

‎.vscode/settings.json

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@
1313
"codersdk",
1414
"cronstrue",
1515
"databasefake",
16+
"DERP",
17+
"derphttp",
18+
"derpmap",
1619
"devel",
1720
"drpc",
1821
"drpcconn",
@@ -25,6 +28,7 @@
2528
"goarch",
2629
"gographviz",
2730
"goleak",
31+
"gonet",
2832
"gossh",
2933
"gsyslog",
3034
"hashicorp",
@@ -34,20 +38,30 @@
3438
"idtoken",
3539
"Iflag",
3640
"incpatch",
41+
"ipnstate",
3742
"isatty",
3843
"Jobf",
3944
"Keygen",
4045
"kirsle",
4146
"Kubernetes",
4247
"ldflags",
48+
"magicsock",
4349
"manifoldco",
4450
"mapstructure",
4551
"mattn",
4652
"mitchellh",
4753
"moby",
4854
"namesgenerator",
55+
"namespacing",
56+
"netaddr",
57+
"netip",
58+
"netmap",
59+
"netns",
60+
"netstack",
61+
"nettype",
4962
"nfpms",
5063
"nhooyr",
64+
"nmcfg",
5165
"nolint",
5266
"nosec",
5367
"ntqry",
@@ -63,14 +77,23 @@
6377
"provisionersdk",
6478
"ptty",
6579
"ptytest",
80+
"reconfig",
6681
"retrier",
6782
"rpty",
6883
"sdkproto",
6984
"sdktrace",
7085
"Signup",
86+
"slogtest",
7187
"sourcemapped",
7288
"Srcs",
7389
"stretchr",
90+
"stuntest",
91+
"tailbroker",
92+
"tailcfg",
93+
"tailexchange",
94+
"tailnet",
95+
"tailnettest",
96+
"Tailscale",
7497
"TCGETS",
7598
"tcpip",
7699
"TCSETS",
@@ -84,19 +107,30 @@
84107
"tfstate",
85108
"tparallel",
86109
"trimprefix",
110+
"tsdial",
111+
"tslogger",
112+
"tstun",
87113
"turnconn",
88114
"typegen",
89115
"unconvert",
90116
"Untar",
117+
"Userspace",
91118
"VMID",
92119
"weblinks",
93120
"webrtc",
121+
"wgcfg",
122+
"wgconfig",
123+
"wgengine",
124+
"wgmonitor",
125+
"wgnet",
94126
"workspaceagent",
127+
"workspaceagents",
95128
"workspaceapp",
96129
"workspaceapps",
97130
"workspacebuilds",
98131
"workspacename",
99132
"wsconncache",
133+
"wsjson",
100134
"xerrors",
101135
"xstate",
102136
"yamux"

‎Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -313,11 +313,11 @@ build/coder_helm_$(VERSION).tgz:
313313
--output "$@"
314314

315315
# Runs migrations to output a dump of the database.
316-
coderd/database/dump.sql: coderd/database/dump/main.go $(wildcard coderd/database/migrations/*.sql)
317-
go run coderd/database/dump/main.go
316+
coderd/database/dump.sql: coderd/database/gen/dump/main.go $(wildcard coderd/database/migrations/*.sql)
317+
go run coderd/database/gen/dump/main.go
318318

319319
# Generates Go code for querying the database.
320-
coderd/database/querier.go: coderd/database/sqlc.yaml coderd/database/dump.sql $(wildcard coderd/database/queries/*.sql)
320+
coderd/database/querier.go: coderd/database/sqlc.yaml coderd/database/dump.sql $(wildcard coderd/database/queries/*.sql) coderd/database/gen/enum/main.go
321321
coderd/database/generate.sh
322322

323323
fmt/prettier:

0 commit comments

Comments
 (0)