Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit1da9804

Browse files
committed
Merge branch 'main' into update-apitypings
2 parents52ada5b +0613797 commit1da9804

File tree

1,010 files changed

+107269
-106281
lines changed

Some content is hidden

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

1,010 files changed

+107269
-106281
lines changed

‎.devcontainer/devcontainer.json‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
{
2-
"name":"Development environments on your infrastructure",
3-
"image":"codercom/oss-dogfood:latest",
2+
"name":"Development environments on your infrastructure",
3+
"image":"codercom/oss-dogfood:latest",
44

5-
"features": {
6-
// See all possible options here https://github.com/devcontainers/features/tree/main/src/docker-in-docker
7-
"ghcr.io/devcontainers/features/docker-in-docker:2": {
8-
"moby":"false"
9-
}
10-
},
11-
// SYS_PTRACE to enable go debugging
12-
"runArgs": ["--cap-add=SYS_PTRACE"]
5+
"features": {
6+
// See all possible options here https://github.com/devcontainers/features/tree/main/src/docker-in-docker
7+
"ghcr.io/devcontainers/features/docker-in-docker:2": {
8+
"moby":"false"
9+
}
10+
},
11+
// SYS_PTRACE to enable go debugging
12+
"runArgs": ["--cap-add=SYS_PTRACE"]
1313
}

‎.git-blame-ignore-revs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,5 @@
33

44
# chore: format code with semicolons when using prettier (#9555)
55
988c9af0153561397686c119da9d1336d2433fdd
6+
# chore: use tabs for prettier and biome (#14283)
7+
95a7c0c4f087744a22c2e88dd3c5d30024d5fb02

‎.github/dependabot.yaml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -95,10 +95,6 @@ updates:
9595
-"@emotion*"
9696
exclude-patterns:
9797
-"jest-runner-eslint"
98-
eslint:
99-
patterns:
100-
-"eslint*"
101-
-"@typescript-eslint*"
10298
jest:
10399
patterns:
104100
-"jest"

‎.github/workflows/ci.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ jobs:
168168

169169
-name:Get golangci-lint cache dir
170170
run:|
171-
linter_ver=$(egrep -o 'GOLANGCI_LINT_VERSION=\S+' dogfood/Dockerfile | cut -d '=' -f 2)
171+
linter_ver=$(egrep -o 'GOLANGCI_LINT_VERSION=\S+' dogfood/contents/Dockerfile | cut -d '=' -f 2)
172172
go install github.com/golangci/golangci-lint/cmd/golangci-lint@v$linter_ver
173173
dir=$(golangci-lint cache status | awk '/Dir/ { print $2 }')
174174
echo "LINT_CACHE_DIR=$dir" >> $GITHUB_ENV

‎.github/workflows/dogfood.yaml‎

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
project:b4q6ltmpzh
5757
token:${{ secrets.DEPOT_TOKEN }}
5858
buildx-fallback:true
59-
context:"{{defaultContext}}:dogfood"
59+
context:"{{defaultContext}}:dogfood/contents"
6060
pull:true
6161
save:true
6262
push:${{ github.ref == 'refs/heads/main' }}
@@ -69,7 +69,7 @@ jobs:
6969
token:${{ secrets.DEPOT_TOKEN }}
7070
buildx-fallback:true
7171
context:"."
72-
file:"dogfood/Dockerfile.nix"
72+
file:"dogfood/contents/Dockerfile.nix"
7373
pull:true
7474
save:true
7575
push:${{ github.ref == 'refs/heads/main' }}
@@ -90,6 +90,9 @@ jobs:
9090
cd dogfood
9191
terraform init -upgrade
9292
terraform validate
93+
cd contents
94+
terraform init -upgrade
95+
terraform validate
9396
9497
-name:Get short commit SHA
9598
if:github.ref == 'refs/heads/main'
@@ -101,22 +104,17 @@ jobs:
101104
id:message
102105
run:echo "pr_title=$(git log --format=%s -n 1 ${{ github.sha }})" >> $GITHUB_OUTPUT
103106

104-
-name:"Get latest Coder binary from the server"
105-
if:github.ref == 'refs/heads/main'
106-
run:|
107-
curl -fsSL "https://dev.coder.com/bin/coder-linux-amd64" -o "./coder"
108-
chmod +x "./coder"
109-
110107
-name:"Push template"
111108
if:github.ref == 'refs/heads/main'
112109
run:|
113-
./coder templates push $CODER_TEMPLATE_NAME --directory $CODER_TEMPLATE_DIR --yes --name=$CODER_TEMPLATE_VERSION --message="$CODER_TEMPLATE_MESSAGE"
110+
cd dogfood
111+
terraform apply -auto-approve
114112
env:
115113
# Consumed by Coder CLI
116114
CODER_URL:https://dev.coder.com
117115
CODER_SESSION_TOKEN:${{ secrets.CODER_SESSION_TOKEN }}
118116
# Template source & details
119-
CODER_TEMPLATE_NAME:${{ secrets.CODER_TEMPLATE_NAME }}
120-
CODER_TEMPLATE_VERSION:${{ steps.vars.outputs.sha_short }}
121-
CODER_TEMPLATE_DIR:./dogfood
122-
CODER_TEMPLATE_MESSAGE:${{ steps.message.outputs.pr_title }}
117+
TF_VAR_CODER_TEMPLATE_NAME:${{ secrets.CODER_TEMPLATE_NAME }}
118+
TF_VAR_CODER_TEMPLATE_VERSION:${{ steps.vars.outputs.sha_short }}
119+
TF_VAR_CODER_TEMPLATE_DIR:./contents
120+
TF_VAR_CODER_TEMPLATE_MESSAGE:${{ steps.message.outputs.pr_title }}

‎.github/workflows/mlc_config.json‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
11
{
2-
"ignorePatterns": [
3-
{
4-
"pattern":"://localhost"
5-
},
6-
{
7-
"pattern":"://.*.?example\\.com"
8-
},
9-
{
10-
"pattern":"developer.github.com"
11-
},
12-
{
13-
"pattern":"docs.github.com"
14-
},
15-
{
16-
"pattern":"support.google.com"
17-
},
18-
{
19-
"pattern":"tailscale.com"
20-
},
21-
{
22-
"pattern":"wireguard.com"
23-
}
24-
],
25-
"aliveStatusCodes": [200,0]
2+
"ignorePatterns": [
3+
{
4+
"pattern":"://localhost"
5+
},
6+
{
7+
"pattern":"://.*.?example\\.com"
8+
},
9+
{
10+
"pattern":"developer.github.com"
11+
},
12+
{
13+
"pattern":"docs.github.com"
14+
},
15+
{
16+
"pattern":"support.google.com"
17+
},
18+
{
19+
"pattern":"tailscale.com"
20+
},
21+
{
22+
"pattern":"wireguard.com"
23+
}
24+
],
25+
"aliveStatusCodes": [200,0]
2626
}

‎.prettierrc.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
printWidth:80
55
proseWrap:always
66
trailingComma:all
7-
useTabs:false
7+
useTabs:true
88
tabWidth:2
99
overrides:
1010
-files:

‎Makefile‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -451,7 +451,7 @@ lint/ts:
451451

452452
lint/go:
453453
./scripts/check_enterprise_imports.sh
454-
linter_ver=$(shell egrep -o 'GOLANGCI_LINT_VERSION=\S+' dogfood/Dockerfile | cut -d '=' -f 2)
454+
linter_ver=$(shell egrep -o 'GOLANGCI_LINT_VERSION=\S+' dogfood/contents/Dockerfile | cut -d '=' -f 2)
455455
go run github.com/golangci/golangci-lint/cmd/golangci-lint@v$$linter_ver run
456456
.PHONY: lint/go
457457

@@ -491,7 +491,7 @@ gen: \
491491
site/src/api/typesGenerated.ts\
492492
coderd/rbac/object_gen.go\
493493
codersdk/rbacresources_gen.go\
494-
site/src/api/rbacresources_gen.ts\
494+
site/src/api/rbacresourcesGenerated.ts\
495495
docs/admin/prometheus.md\
496496
docs/reference/cli/README.md\
497497
docs/admin/audit-logs.md\
@@ -520,7 +520,7 @@ gen/mark-fresh:
520520
site/src/api/typesGenerated.ts\
521521
coderd/rbac/object_gen.go\
522522
codersdk/rbacresources_gen.go\
523-
site/src/api/rbacresources_gen.ts\
523+
site/src/api/rbacresourcesGenerated.ts\
524524
docs/admin/prometheus.md\
525525
docs/reference/cli/README.md\
526526
docs/admin/audit-logs.md\
@@ -621,8 +621,8 @@ coderd/rbac/object_gen.go: scripts/rbacgen/rbacobject.gotmpl scripts/rbacgen/mai
621621
codersdk/rbacresources_gen.go: scripts/rbacgen/codersdk.gotmpl scripts/rbacgen/main.go coderd/rbac/object.go coderd/rbac/policy/policy.go
622622
go run scripts/rbacgen/main.go codersdk> codersdk/rbacresources_gen.go
623623

624-
site/src/api/rbacresources_gen.ts: scripts/rbacgen/codersdk.gotmpl scripts/rbacgen/main.go coderd/rbac/object.go coderd/rbac/policy/policy.go
625-
go run scripts/rbacgen/main.go typescript>site/src/api/rbacresources_gen.ts
624+
site/src/api/rbacresourcesGenerated.ts: scripts/rbacgen/codersdk.gotmpl scripts/rbacgen/main.go coderd/rbac/object.go coderd/rbac/policy/policy.go
625+
go run scripts/rbacgen/main.go typescript>"$@"
626626

627627

628628
docs/admin/prometheus.md: scripts/metricsdocgen/main.go scripts/metricsdocgen/metrics

‎coderd/apidoc/docs.go‎

Lines changed: 44 additions & 0 deletions
Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp