From 2a96c20739c56a3428ab6a7c24603fe18c82dc21 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 30 Nov 2024 11:58:00 -0300 Subject: [PATCH 1/4] chore(deps): bump github.com/stretchr/testify from 1.9.0 to 1.10.0 (#1928) Bumps [github.com/stretchr/testify](https://github.com/stretchr/testify) from 1.9.0 to 1.10.0. - [Release notes](https://github.com/stretchr/testify/releases) - [Commits](https://github.com/stretchr/testify/compare/v1.9.0...v1.10.0) --- updated-dependencies: - dependency-name: github.com/stretchr/testify dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index e0291d4928..cea56bbde7 100644 --- a/go.mod +++ b/go.mod @@ -21,7 +21,7 @@ require ( github.com/radovskyb/watcher v1.0.7 github.com/sajari/fuzzy v1.0.0 github.com/spf13/pflag v1.0.5 - github.com/stretchr/testify v1.9.0 + github.com/stretchr/testify v1.10.0 github.com/zeebo/xxh3 v1.0.2 golang.org/x/sync v0.9.0 golang.org/x/term v0.26.0 diff --git a/go.sum b/go.sum index 849db5d10a..d2ca7e3df6 100644 --- a/go.sum +++ b/go.sum @@ -120,8 +120,8 @@ github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY= github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= -github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= -github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= +github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA= +github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/xanzy/ssh-agent v0.3.3 h1:+/15pJfg/RsTxqYcX6fHqOXZwwMP+2VyYWJeWM2qQFM= github.com/xanzy/ssh-agent v0.3.3/go.mod h1:6dzNDKs0J9rVPHPhaGCukekBHKqfl+L3KghI1Bc68Uw= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= From 41884f0a69c2ca66f93ea648ca9408ab8169d9f5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 30 Nov 2024 11:58:17 -0300 Subject: [PATCH 2/4] chore(deps): bump github.com/Masterminds/semver/v3 from 3.3.0 to 3.3.1 (#1927) Bumps [github.com/Masterminds/semver/v3](https://github.com/Masterminds/semver) from 3.3.0 to 3.3.1. - [Release notes](https://github.com/Masterminds/semver/releases) - [Changelog](https://github.com/Masterminds/semver/blob/master/CHANGELOG.md) - [Commits](https://github.com/Masterminds/semver/compare/v3.3.0...v3.3.1) --- updated-dependencies: - dependency-name: github.com/Masterminds/semver/v3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index cea56bbde7..27fa62475e 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.22.0 require ( github.com/Ladicle/tabwriter v1.0.0 - github.com/Masterminds/semver/v3 v3.3.0 + github.com/Masterminds/semver/v3 v3.3.1 github.com/alecthomas/chroma/v2 v2.14.0 github.com/chainguard-dev/git-urls v1.0.2 github.com/davecgh/go-spew v1.1.1 diff --git a/go.sum b/go.sum index d2ca7e3df6..8ec7b4feee 100644 --- a/go.sum +++ b/go.sum @@ -2,8 +2,8 @@ dario.cat/mergo v1.0.0 h1:AGCNq9Evsj31mOgNPcLyXc+4PNABt905YmuqPYYpBWk= dario.cat/mergo v1.0.0/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk= github.com/Ladicle/tabwriter v1.0.0 h1:DZQqPvMumBDwVNElso13afjYLNp0Z7pHqHnu0r4t9Dg= github.com/Ladicle/tabwriter v1.0.0/go.mod h1:c4MdCjxQyTbGuQO/gvqJ+IA/89UEwrsD6hUCW98dyp4= -github.com/Masterminds/semver/v3 v3.3.0 h1:B8LGeaivUe71a5qox1ICM/JLl0NqZSW5CHyL+hmvYS0= -github.com/Masterminds/semver/v3 v3.3.0/go.mod h1:4V+yj/TJE1HU9XfppCwVMZq3I84lprf4nC11bSS5beM= +github.com/Masterminds/semver/v3 v3.3.1 h1:QtNSWtVZ3nBfk8mAOu/B6v7FMJ+NHTIgUPi7rj+4nv4= +github.com/Masterminds/semver/v3 v3.3.1/go.mod h1:4V+yj/TJE1HU9XfppCwVMZq3I84lprf4nC11bSS5beM= github.com/Microsoft/go-winio v0.5.2/go.mod h1:WpS1mjBmmwHBEWmogvA2mj8546UReBk4v8QkMxJ6pZY= github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow= github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM= From bc844246d424f55496d8a0ac28b9ec6bfe6cb687 Mon Sep 17 00:00:00 2001 From: Oleksandr Redko Date: Sat, 30 Nov 2024 17:00:58 +0200 Subject: [PATCH 3/4] chore: allow using only github.com/go-task/task/v3/errors package (#1926) --- .golangci.yml | 11 +++++++++++ cmd/release/main.go | 3 ++- internal/execext/exec.go | 3 ++- internal/flags/flags.go | 2 +- precondition.go | 2 +- 5 files changed, 17 insertions(+), 4 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index 19d45198b3..fec3baa882 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -5,12 +5,23 @@ linters: enable: + - depguard - goimports - gofmt - gofumpt - misspell linters-settings: + depguard: + rules: + main: + files: + - "$all" + - "!$test" + - "!**/errors/*.go" + deny: + - pkg: "errors" + desc: "Use github.com/go-task/task/v3/errors instead" goimports: local-prefixes: github.com/go-task gofmt: diff --git a/cmd/release/main.go b/cmd/release/main.go index efccff9e53..dfe0960a01 100644 --- a/cmd/release/main.go +++ b/cmd/release/main.go @@ -1,7 +1,6 @@ package main import ( - "errors" "fmt" "os" "os/exec" @@ -12,6 +11,8 @@ import ( "github.com/Masterminds/semver/v3" "github.com/otiai10/copy" "github.com/spf13/pflag" + + "github.com/go-task/task/v3/errors" ) const ( diff --git a/internal/execext/exec.go b/internal/execext/exec.go index 69ab8865f3..1de964e76d 100644 --- a/internal/execext/exec.go +++ b/internal/execext/exec.go @@ -2,7 +2,6 @@ package execext import ( "context" - "errors" "fmt" "io" "os" @@ -14,6 +13,8 @@ import ( "mvdan.cc/sh/v3/interp" "mvdan.cc/sh/v3/shell" "mvdan.cc/sh/v3/syntax" + + "github.com/go-task/task/v3/errors" ) // RunCommandOptions is the options for the RunCommand func diff --git a/internal/flags/flags.go b/internal/flags/flags.go index cf884fe091..58762c405d 100644 --- a/internal/flags/flags.go +++ b/internal/flags/flags.go @@ -2,7 +2,6 @@ package flags import ( "cmp" - "errors" "log" "os" "strconv" @@ -10,6 +9,7 @@ import ( "github.com/spf13/pflag" + "github.com/go-task/task/v3/errors" "github.com/go-task/task/v3/internal/experiments" "github.com/go-task/task/v3/taskfile/ast" ) diff --git a/precondition.go b/precondition.go index 3ae9ad0466..1f25bd37f5 100644 --- a/precondition.go +++ b/precondition.go @@ -2,8 +2,8 @@ package task import ( "context" - "errors" + "github.com/go-task/task/v3/errors" "github.com/go-task/task/v3/internal/env" "github.com/go-task/task/v3/internal/execext" "github.com/go-task/task/v3/internal/logger" From 973e928c28a99d76a2c161fedd682ea610ec1df7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 30 Nov 2024 12:01:46 -0300 Subject: [PATCH 4/4] chore(deps): bump cross-spawn from 7.0.3 to 7.0.6 in /website (#1934) Bumps [cross-spawn](https://github.com/moxystudio/node-cross-spawn) from 7.0.3 to 7.0.6. - [Changelog](https://github.com/moxystudio/node-cross-spawn/blob/master/CHANGELOG.md) - [Commits](https://github.com/moxystudio/node-cross-spawn/compare/v7.0.3...v7.0.6) --- updated-dependencies: - dependency-name: cross-spawn dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- website/yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/website/yarn.lock b/website/yarn.lock index dd3514304f..39d6517b3d 100644 --- a/website/yarn.lock +++ b/website/yarn.lock @@ -4135,9 +4135,9 @@ cosmiconfig@^8.1.3, cosmiconfig@^8.2.0: path-type "^4.0.0" cross-spawn@^7.0.3: - version "7.0.3" - resolved "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz" - integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w== + version "7.0.6" + resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.6.tgz#8a58fe78f00dcd70c370451759dfbfaf03e8ee9f" + integrity sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA== dependencies: path-key "^3.1.0" shebang-command "^2.0.0"