From 144ef84ab7508eab6eee8773cd3ba4bc7c5e5ae1 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 7 Sep 2026 23:18:47 +0000 Subject: [PATCH 1/2] chore(deps): update dependency golangci/golangci-lint to v2.13.2 in .github/workflows/go-lint.yml Signed-off-by: Rui Chen --- .github/workflows/go-lint.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/go-lint.yml b/.github/workflows/go-lint.yml index 61831776a2..6886dcad10 100644 --- a/.github/workflows/go-lint.yml +++ b/.github/workflows/go-lint.yml @@ -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 @@ -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 From d9385806e82b5d8338f35beb0ba384e97a69cc7a Mon Sep 17 00:00:00 2001 From: Rui Chen Date: Mon, 7 Sep 2026 19:26:39 -0400 Subject: [PATCH 2/2] fix(lint): address golangci-lint 2.13 findings Preserve coverage of the legacy GitLab WorkInProgress field while updating error type checks. Assisted-by: OpenAI Signed-off-by: Rui Chen --- server/events/apply_plan_validator.go | 3 +-- server/events/markdown_renderer.go | 3 +-- server/events/vcs/gitlab/client_test.go | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/server/events/apply_plan_validator.go b/server/events/apply_plan_validator.go index 1c485cd0d4..4918bdcfbc 100644 --- a/server/events/apply_plan_validator.go +++ b/server/events/apply_plan_validator.go @@ -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 diff --git a/server/events/markdown_renderer.go b/server/events/markdown_renderer.go index c0dcb3b257..cfe2b9f922 100644 --- a/server/events/markdown_renderer.go +++ b/server/events/markdown_renderer.go @@ -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 diff --git a/server/events/vcs/gitlab/client_test.go b/server/events/vcs/gitlab/client_test.go index be6584145b..dca8d41685 100644 --- a/server/events/vcs/gitlab/client_test.go +++ b/server/events/vcs/gitlab/client_test.go @@ -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,