Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/go-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ jobs:
uses: golangci/golangci-lint-action@ba0d7d2ec06a0ea1cb5fa41b2e4a3ab91d21278a # v9
with:
# renovate: datasource=github-releases depName=golangci/golangci-lint
version: v2.12.2
version: v2.13.2

# e2e module (separate go.mod)
- uses: actions/setup-go@924ae3a1cded613372ab5595356fb5720e22ba16 # v6
Expand All @@ -81,7 +81,7 @@ jobs:
uses: golangci/golangci-lint-action@ba0d7d2ec06a0ea1cb5fa41b2e4a3ab91d21278a # v9
with:
# renovate: datasource=github-releases depName=golangci/golangci-lint
version: v2.12.2
version: v2.13.2
working-directory: e2e
args: --config=../.golangci.yml

Expand Down
3 changes: 1 addition & 2 deletions server/events/apply_plan_validator.go
Original file line number Diff line number Diff line change
Expand Up @@ -141,8 +141,7 @@ func (v *DefaultApplyPlanValidator) ValidateProjectPlan(ctx command.ProjectConte
}

if err := v.validateProjectPlanStatus(ctx); err != nil {
var rejection planRejectionError
if errors.As(err, &rejection) {
if rejection, ok := errors.AsType[planRejectionError](err); ok {
return rejectProjectPlan(planPath, "%s", rejection.err)
}
return err
Expand Down
3 changes: 1 addition & 2 deletions server/events/markdown_renderer.go
Original file line number Diff line number Diff line change
Expand Up @@ -437,8 +437,7 @@ func (m *MarkdownRenderer) renderProjectResults(ctx *command.Context, results []

func newErrData(err error, renderedContext string, common commonData) errData {
data := errData{Error: err.Error(), RenderedContext: renderedContext, commonData: common}
var lockErr *workingDirLockError
if errors.As(err, &lockErr) {
if lockErr, ok := errors.AsType[*workingDirLockError](err); ok {
data.HeadCommit = lockErr.metadata.HeadCommit
data.CommitURL = lockErr.metadata.CommitURL
data.JobURL = lockErr.metadata.JobURL
Expand Down
2 changes: 1 addition & 1 deletion server/events/vcs/gitlab/client_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1649,7 +1649,7 @@ func TestClient_gitlabIsMergeable(t *testing.T) {
BlockingDiscussionsResolved: true,
DetailedMergeStatus: "mergeable",
},
WorkInProgress: true,
WorkInProgress: true, //nolint:staticcheck // Exercise compatibility with older GitLab JSON responses.
},
project: &gitlab.Project{},
supportsDetailedMergeStatus: true,
Expand Down
Loading