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 hack/tools.mk
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ GOIMPORTS_REVISER_VERSION ?= v3.12.6
# renovate: datasource=github-releases depName=ko-build/ko
KO_VERSION ?= v0.18.1
# renovate: datasource=github-releases depName=golangci/golangci-lint
GOLANGCI_LINT_VERSION ?= v2.11.4
GOLANGCI_LINT_VERSION ?= v2.12.2

# Tool targets should declare go.mod as a prerequisite, if the tool's version is managed via go modules. This causes
# make to rebuild the tool in the desired version, when go.mod is changed.
Expand Down Expand Up @@ -37,4 +37,4 @@ $(KO): $(call tool_version_file,$(KO),$(KO_VERSION))

GOLANGCI_LINT := $(TOOLS_BIN_DIR)/golangci-lint
$(GOLANGCI_LINT): $(call tool_version_file,$(GOLANGCI_LINT),$(GOLANGCI_LINT_VERSION))
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(TOOLS_BIN_DIR) $(GOLANGCI_LINT_VERSION)
GOBIN=$(abspath $(TOOLS_BIN_DIR)) go install github.com/golangci/golangci-lint/v2/cmd/golangci-lint@$(GOLANGCI_LINT_VERSION)
4 changes: 2 additions & 2 deletions test/e2e/e2e_suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import (
"fmt"
"os"
"os/exec"
"slices"
"testing"

. "github.com/onsi/ginkgo/v2"
Expand Down Expand Up @@ -89,8 +90,7 @@ var _ = AfterSuite(func(ctx context.Context) {
_, _ = fmt.Fprintf(GinkgoWriter, "MCM uninstall output: %s\n", string(output))

By("cleaning up tracked test resources after MCM removal")
for i := len(testResources) - 1; i >= 0; i-- {
resource := testResources[i]
for _, resource := range slices.Backward(testResources) {
// Wrap each cleanup in a function with GinkgoRecover to prevent one failure
// from stopping cleanup of remaining resources
func(res TestResource) {
Expand Down