Commita1270c4

authored

Merge branch 'main' into jon/esbuild

2 parentsdb61572 +e8b7ce8 commita1270c4Copy full SHA for a1270c4

File tree

+306

-122

lines changed

+306

-122

lines changed

Lines changed: 1 addition & 0 deletions

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -677,8 +677,8 @@ jobs:`
`677`	`677`	`variant:`
`678`	`678`	`-premium:false`
`679`	`679`	`name:test-e2e`
`680`		`- -premium:true`
`681`		`-name:test-e2e-premium`
	`680`	`+#- premium: true`
	`681`	`+# name: test-e2e-premium`
`682`	`682`	`# Skip test-e2e on forks as they don't have access to CI secrets`
`683`	`683`	`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)`
`684`	`684`	`timeout-minutes:20`

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -164,6 +164,7 @@ linters-settings:`
`164`	`164`	`-name:unnecessary-stmt`
`165`	`165`	`-name:unreachable-code`
`166`	`166`	`-name:unused-parameter`
	`167`	`+exclude:"*/_test.go"`
`167`	`168`	`-name:unused-receiver`
`168`	`169`	`-name:var-declaration`
`169`	`170`	`-name:var-naming`
`@@ -195,8 +196,6 @@ issues:`
`195`	`196`	`-errcheck`
`196`	`197`	`-forcetypeassert`
`197`	`198`	`-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`
`200`	`199`	`-path:scripts/*`
`201`	`200`	`linters:`
`202`	`201`	`-exhaustruct`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,7 @@ func TestBatchCreateLogs(t *testing.T) {`
`118`	`118`	`level=database.LogLevel(strings.ToLower(logEntry.Level.String()))`
`119`	`119`	`}`
`120`	`120`	`insertWorkspaceAgentLogsParams.Level[i]=level`
`121`		`-insertWorkspaceAgentLogsParams.OutputLength+=int32(len(logEntry.Output))`
	`121`	`+insertWorkspaceAgentLogsParams.OutputLength+=int32(len(logEntry.Output))// nolint:gosec`
`122`	`122`
`123`	`123`	`insertWorkspaceAgentLogsReturn[i]= database.WorkspaceAgentLog{`
`124`	`124`	`AgentID:agent.ID,`
`@@ -270,7 +270,7 @@ func TestBatchCreateLogs(t *testing.T) {`
`270`	`270`	`CreatedAt:now,`
`271`	`271`	`Output: []string{"hello world"},`
`272`	`272`	`Level: []database.LogLevel{database.LogLevelInfo},`
`273`		`-OutputLength:int32(len(req.Logs[0].Output)),`
	`273`	`+OutputLength:int32(len(req.Logs[0].Output)),// nolint:gosec`
`274`	`274`	`}`
`275`	`275`	`dbInsertRes:= []database.WorkspaceAgentLog{`
`276`	`276`	`{`

Comments

(0)