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

Commit68daf40

Browse files
authored
Merge branch 'main' into aibridge-client-instructions
2 parents33c54ea +daad939 commit68daf40

File tree

22 files changed

+164
-133
lines changed

22 files changed

+164
-133
lines changed

‎.github/workflows/ci.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ jobs:
191191
192192
# Check for any typos
193193
-name:Check for typos
194-
uses:crate-ci/typos@80c8a4945eec0f6d464eaf9e65ed98ef085283d1# v1.38.1
194+
uses:crate-ci/typos@07d900b8fa1097806b8adb6391b0d3e0ac2fdea7# v1.39.0
195195
with:
196196
config:.github/workflows/typos.toml
197197

@@ -794,7 +794,7 @@ jobs:
794794
# the check to pass. This is desired in PRs, but not in mainline.
795795
-name:Publish to Chromatic (non-mainline)
796796
if:github.ref != 'refs/heads/main' && github.repository_owner == 'coder'
797-
uses:chromaui/action@bc2d84ad2b60813a67d995c5582d696104a19383# v13.3.2
797+
uses:chromaui/action@ac86f2ff0a458ffbce7b40698abd44c0fa34d4b6# v13.3.3
798798
env:
799799
NODE_OPTIONS:"--max_old_space_size=4096"
800800
STORYBOOK:true
@@ -826,7 +826,7 @@ jobs:
826826
# infinitely "in progress" in mainline unless we re-review each build.
827827
-name:Publish to Chromatic (mainline)
828828
if:github.ref == 'refs/heads/main' && github.repository_owner == 'coder'
829-
uses:chromaui/action@bc2d84ad2b60813a67d995c5582d696104a19383# v13.3.2
829+
uses:chromaui/action@ac86f2ff0a458ffbce7b40698abd44c0fa34d4b6# v13.3.3
830830
env:
831831
NODE_OPTIONS:"--max_old_space_size=4096"
832832
STORYBOOK:true

‎.github/workflows/deploy.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ jobs:
9292
uses:google-github-actions/setup-gcloud@aa5489c8933f4cc7a4f7d45035b3b1440c9c10db# v3.0.1
9393

9494
-name:Set up Flux CLI
95-
uses:fluxcd/flux2/action@4a15fa6a023259353ef750acf1c98fe88407d4d0# v2.7.2
95+
uses:fluxcd/flux2/action@b6e76ca2534f76dcb8dd94fb057cdfa923c3b641# v2.7.3
9696
with:
9797
# Keep this and the github action up to date with the version of flux installed in dogfood cluster
9898
version:"2.7.0"

‎.github/workflows/docs-ci.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
-name:Setup Node
3131
uses:./.github/actions/setup-node
3232

33-
-uses:tj-actions/changed-files@dbf178ceecb9304128c8e0648591d71208c6e2c9# v45.0.7
33+
-uses:tj-actions/changed-files@0ff001de0805038ff3f118de4875002200057732# v45.0.7
3434
id:changed-files
3535
with:
3636
files:|

‎.github/workflows/scorecard.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,6 @@ jobs:
4747

4848
# Upload the results to GitHub's code scanning dashboard.
4949
-name:"Upload to code-scanning"
50-
uses:github/codeql-action/upload-sarif@4e94bd11f71e507f7f87df81788dff88d1dacbfb# v3.29.5
50+
uses:github/codeql-action/upload-sarif@0499de31b99561a6d14a36a5f662c2a54f91beee# v3.29.5
5151
with:
5252
sarif_file:results.sarif

‎.github/workflows/security.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
uses:./.github/actions/setup-go
4141

4242
-name:Initialize CodeQL
43-
uses:github/codeql-action/init@4e94bd11f71e507f7f87df81788dff88d1dacbfb# v3.29.5
43+
uses:github/codeql-action/init@0499de31b99561a6d14a36a5f662c2a54f91beee# v3.29.5
4444
with:
4545
languages:go, javascript
4646

@@ -50,7 +50,7 @@ jobs:
5050
rm Makefile
5151
5252
-name:Perform CodeQL Analysis
53-
uses:github/codeql-action/analyze@4e94bd11f71e507f7f87df81788dff88d1dacbfb# v3.29.5
53+
uses:github/codeql-action/analyze@0499de31b99561a6d14a36a5f662c2a54f91beee# v3.29.5
5454

5555
-name:Send Slack notification on failure
5656
if:${{ failure() }}
@@ -154,7 +154,7 @@ jobs:
154154
severity:"CRITICAL,HIGH"
155155

156156
-name:Upload Trivy scan results to GitHub Security tab
157-
uses:github/codeql-action/upload-sarif@4e94bd11f71e507f7f87df81788dff88d1dacbfb# v3.29.5
157+
uses:github/codeql-action/upload-sarif@0499de31b99561a6d14a36a5f662c2a54f91beee# v3.29.5
158158
with:
159159
sarif_file:trivy-results.sarif
160160
category:"Trivy"

‎.github/workflows/stale.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ jobs:
125125
egress-policy:audit
126126

127127
-name:Delete PR Cleanup workflow runs
128-
uses:Mattraks/delete-workflow-runs@ab482449ba468316e9a8801e092d0405715c5e6d# v2.1.0
128+
uses:Mattraks/delete-workflow-runs@86d29a75093353c4c509a876c176234037c2025b# v2.1.0
129129
with:
130130
token:${{ github.token }}
131131
repository:${{ github.repository }}
@@ -134,7 +134,7 @@ jobs:
134134
delete_workflow_pattern:pr-cleanup.yaml
135135

136136
-name:Delete PR Deploy workflow skipped runs
137-
uses:Mattraks/delete-workflow-runs@ab482449ba468316e9a8801e092d0405715c5e6d# v2.1.0
137+
uses:Mattraks/delete-workflow-runs@86d29a75093353c4c509a876c176234037c2025b# v2.1.0
138138
with:
139139
token:${{ github.token }}
140140
repository:${{ github.repository }}

‎cli/exp_task_test.go‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ func Test_Tasks(t *testing.T) {
5353
taskName=strings.ReplaceAll(testutil.GetRandomName(t),"_","-")
5454
)
5555

56-
//nolint:paralleltest // The sub-tests of this test must be run sequentially.
5756
for_,tc:=range []struct {
5857
namestring
5958
cmdArgs []string
@@ -135,16 +134,15 @@ func Test_Tasks(t *testing.T) {
135134
},
136135
},
137136
} {
138-
t.Run(tc.name,func(t*testing.T) {
139-
varstdout strings.Builder
140-
inv,root:=clitest.New(t,tc.cmdArgs...)
141-
inv.Stdout=&stdout
142-
clitest.SetupConfig(t,userClient,root)
143-
require.NoError(t,inv.WithContext(ctx).Run())
144-
iftc.assertFn!=nil {
145-
tc.assertFn(stdout.String(),userClient)
146-
}
147-
})
137+
t.Logf("test case: %q",tc.name)
138+
varstdout strings.Builder
139+
inv,root:=clitest.New(t,tc.cmdArgs...)
140+
inv.Stdout=&stdout
141+
clitest.SetupConfig(t,userClient,root)
142+
require.NoError(t,inv.WithContext(ctx).Run(),tc.name)
143+
iftc.assertFn!=nil {
144+
tc.assertFn(stdout.String(),userClient)
145+
}
148146
}
149147
}
150148

‎coderd/aitasks.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ func (api *API) tasksCreate(rw http.ResponseWriter, r *http.Request) {
9292

9393
if!templateVersion.HasAITask.Valid||!templateVersion.HasAITask.Bool {
9494
httpapi.Write(ctx,rw,http.StatusBadRequest, codersdk.Response{
95-
Message:fmt.Sprintf(`Template does not haverequired parameter %q`,codersdk.AITaskPromptParameterName),
95+
Message:`Template does not havea valid "coder_ai_task" resource.`,
9696
})
9797
return
9898
}

‎coderd/database/check_constraint.go‎

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

‎coderd/database/dump.sql‎

Lines changed: 0 additions & 1 deletion
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