Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit a1270c4

Browse files
authored
Merge branch 'main' into jon/esbuild
2 parents db61572 + e8b7ce8 commit a1270c4

File tree

27 files changed

+306
-122
lines changed

27 files changed

+306
-122
lines changed

.github/.linkspector.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,6 @@ ignorePatterns:
2323
- pattern: "wiki.ubuntu.com"
2424
- pattern: "mutagen.io"
2525
- pattern: "docs.github.com"
26+
- pattern: "claude.ai"
2627
aliveStatusCodes:
2728
- 200

.github/workflows/ci.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -677,8 +677,8 @@ jobs:
677677
variant:
678678
- premium: false
679679
name: test-e2e
680-
- premium: true
681-
name: test-e2e-premium
680+
#- premium: true
681+
# name: test-e2e-premium
682682
# Skip test-e2e on forks as they don't have access to CI secrets
683683
if: (needs.changes.outputs.go == 'true' || needs.changes.outputs.ts == 'true' || needs.changes.outputs.ci == 'true' || github.ref == 'refs/heads/main') && !(github.event.pull_request.head.repo.fork)
684684
timeout-minutes: 20

.golangci.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,7 @@ linters-settings:
164164
- name: unnecessary-stmt
165165
- name: unreachable-code
166166
- name: unused-parameter
167+
exclude: "**/*_test.go"
167168
- name: unused-receiver
168169
- name: var-declaration
169170
- name: var-naming
@@ -195,8 +196,6 @@ issues:
195196
- errcheck
196197
- forcetypeassert
197198
- exhaustruct # This is unhelpful in tests.
198-
- revive # TODO(JonA): disabling in order to update golangci-lint
199-
- gosec # TODO(JonA): disabling in order to update golangci-lint
200199
- path: scripts/*
201200
linters:
202201
- exhaustruct

coderd/agentapi/logs_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ func TestBatchCreateLogs(t *testing.T) {
118118
level = database.LogLevel(strings.ToLower(logEntry.Level.String()))
119119
}
120120
insertWorkspaceAgentLogsParams.Level[i] = level
121-
insertWorkspaceAgentLogsParams.OutputLength += int32(len(logEntry.Output))
121+
insertWorkspaceAgentLogsParams.OutputLength += int32(len(logEntry.Output)) // nolint:gosec
122122

123123
insertWorkspaceAgentLogsReturn[i] = database.WorkspaceAgentLog{
124124
AgentID: agent.ID,
@@ -270,7 +270,7 @@ func TestBatchCreateLogs(t *testing.T) {
270270
CreatedAt: now,
271271
Output: []string{"hello world"},
272272
Level: []database.LogLevel{database.LogLevelInfo},
273-
OutputLength: int32(len(req.Logs[0].Output)),
273+
OutputLength: int32(len(req.Logs[0].Output)), // nolint:gosec
274274
}
275275
dbInsertRes := []database.WorkspaceAgentLog{
276276
{

0 commit comments

Comments
 (0)