From a20655f4f985075627138fa9303fd29a554607f2 Mon Sep 17 00:00:00 2001 From: Stephen Augustus Date: Tue, 3 Dec 2024 08:07:27 -0500 Subject: [PATCH] go.mod: Replace `carolynvs/magex` with `uwu-tools/magex` v0.10.0 Signed-off-by: Stephen Augustus --- ci/azure.go | 4 ++-- docker/docker.go | 2 +- git/dco.go | 2 +- go.mod | 6 +++--- go.sum | 29 +++++++++-------------------- magefile.go | 4 ++-- mixins/magefile.go | 6 +++--- porter/config.go | 2 +- porter/config_test.go | 2 +- porter/porter.go | 10 +++++----- porter/porter_test.go | 4 ++-- releases/build.go | 4 ++-- releases/git.go | 6 +++--- releases/publish.go | 4 ++-- releases/publish_test.go | 4 ++-- tests/kind.go | 6 +++--- tools/install.go | 8 ++++---- tools/install_test.go | 6 +++--- 18 files changed, 49 insertions(+), 60 deletions(-) diff --git a/ci/azure.go b/ci/azure.go index 9bf9f3d..27df40c 100644 --- a/ci/azure.go +++ b/ci/azure.go @@ -6,9 +6,9 @@ import ( "os" "get.porter.sh/magefiles/tools" - "github.com/carolynvs/magex/pkg/gopath" + "github.com/uwu-tools/magex/pkg/gopath" - "github.com/carolynvs/magex/ci" + "github.com/uwu-tools/magex/ci" ) // ConfigureAgent sets up a CI worker agent with mage and ensures diff --git a/docker/docker.go b/docker/docker.go index 3a82e83..d9612c2 100644 --- a/docker/docker.go +++ b/docker/docker.go @@ -11,7 +11,7 @@ import ( "strings" "time" - "github.com/carolynvs/magex/shx" + "github.com/uwu-tools/magex/shx" "github.com/magefile/mage/mg" "github.com/magefile/mage/sh" ) diff --git a/git/dco.go b/git/dco.go index 02a21ca..bab2bc8 100644 --- a/git/dco.go +++ b/git/dco.go @@ -8,7 +8,7 @@ import ( "path/filepath" "strings" - "github.com/carolynvs/magex/xplat" + "github.com/uwu-tools/magex/xplat" ) //go:embed dco/prepare-commit-msg diff --git a/go.mod b/go.mod index 2f41909..42950a2 100644 --- a/go.mod +++ b/go.mod @@ -4,9 +4,9 @@ go 1.21 require ( github.com/Masterminds/semver/v3 v3.2.1 - github.com/carolynvs/magex v0.9.0 github.com/magefile/mage v1.15.0 - github.com/stretchr/testify v1.7.1 + github.com/stretchr/testify v1.8.2 + github.com/uwu-tools/magex v0.10.0 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c ) @@ -25,5 +25,5 @@ require ( github.com/ulikunitz/xz v0.5.11 // indirect github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect - gopkg.in/yaml.v3 v3.0.0 // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/go.sum b/go.sum index 920e83a..812566b 100644 --- a/go.sum +++ b/go.sum @@ -1,13 +1,8 @@ -github.com/Masterminds/semver/v3 v3.1.1 h1:hLg3sBzpNErnxhQtUy/mmLR2I9foDujNK030IGemrRc= -github.com/Masterminds/semver/v3 v3.1.1/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs= github.com/Masterminds/semver/v3 v3.2.1 h1:RN9w6+7QoMeJVGyfmbcgs28Br8cvmnucEXnY0rYXWg0= github.com/Masterminds/semver/v3 v3.2.1/go.mod h1:qvl/7zhW3nngYb5+80sSMF+FG2BjYrf8m9wsX0PNOMQ= -github.com/andybalholm/brotli v1.0.1 h1:KqhlKozYbRtJvsPrrEeXcO+N2l6NYT5A2QAFmSULpEc= github.com/andybalholm/brotli v1.0.1/go.mod h1:loMXtMfwqflxFJPmdbJO0a3KNoPuLBgiu3qAvBg8x/Y= github.com/andybalholm/brotli v1.1.0 h1:eLKJA0d02Lf0mVpIDgYnqXcUn0GqVmEFny3VuID1U3M= github.com/andybalholm/brotli v1.1.0/go.mod h1:sms7XGricyQI9K10gOSf56VKKWS4oLer58Q+mhRPtnY= -github.com/carolynvs/magex v0.9.0 h1:fWe7oshGv6zuei5Z6EI95RSlOKjIifBZ26myB9G+m/I= -github.com/carolynvs/magex v0.9.0/go.mod h1:H1LW6RYJ/sNbisMmPe9E73aJZa8geKLKK9mBWLWz3ek= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= @@ -16,19 +11,14 @@ github.com/dsnet/compress v0.0.2-0.20210315054119-f66993602bf5 h1:iFaUwBSo5Svw6L github.com/dsnet/compress v0.0.2-0.20210315054119-f66993602bf5/go.mod h1:qssHWj60/X5sZFNxpG4HBPDHVqxNm4DfnCKgrbZOT+s= github.com/dsnet/golib v0.0.0-20171103203638-1ea166775780/go.mod h1:Lj+Z9rebOhdfkVLjJ8T6VcRQv3SXugXy999NBtR9aFY= github.com/golang/snappy v0.0.2/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= -github.com/golang/snappy v0.0.4-0.20210608040537-544b4180ac70 h1:yxuuMouxXYv9V1HprM9jTODJPGrTrC0FYVtPSnyIXxs= -github.com/golang/snappy v0.0.4-0.20210608040537-544b4180ac70/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/klauspost/compress v1.4.1/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= github.com/klauspost/compress v1.11.4/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= -github.com/klauspost/compress v1.15.1 h1:y9FcTHGyrebwfP0ZZqFiaxTaiDnUrGkJkI+f583BL1A= -github.com/klauspost/compress v1.15.1/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk= github.com/klauspost/compress v1.17.7 h1:ehO88t2UGzQK66LMdE8tibEd1ErmzZjNEqWkjLAKQQg= github.com/klauspost/compress v1.17.7/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= github.com/klauspost/cpuid v1.2.0/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek= -github.com/klauspost/pgzip v1.2.5 h1:qnWYvvKqedOF2ulHpMG72XQol4ILEJ8k2wwRl/Km8oE= github.com/klauspost/pgzip v1.2.5/go.mod h1:Ch1tH69qFZu15pkjo5kYi6mth2Zzwzt50oCQKQE9RUs= github.com/klauspost/pgzip v1.2.6 h1:8RXeL5crjEUFnR2/Sn6GJNWtSQ3Dk8pq4CL3jvdDyjU= github.com/klauspost/pgzip v1.2.6/go.mod h1:Ch1tH69qFZu15pkjo5kYi6mth2Zzwzt50oCQKQE9RUs= @@ -38,32 +28,31 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= -github.com/magefile/mage v1.13.0/go.mod h1:z5UZb/iS3GoOSn0JgWuiw7dxlurVYTu+/jHXqQg881A= -github.com/magefile/mage v1.14.0 h1:6QDX3g6z1YvJ4olPhT1wksUcSa/V0a1B+pJb73fBjyo= -github.com/magefile/mage v1.14.0/go.mod h1:z5UZb/iS3GoOSn0JgWuiw7dxlurVYTu+/jHXqQg881A= github.com/magefile/mage v1.15.0 h1:BvGheCMAsG3bWUDbZ8AyXXpCNwU9u5CB6sM+HNb9HYg= github.com/magefile/mage v1.15.0/go.mod h1:z5UZb/iS3GoOSn0JgWuiw7dxlurVYTu+/jHXqQg881A= github.com/mholt/archiver/v3 v3.5.1 h1:rDjOBX9JSF5BvoJGvjqK479aL70qh9DIpZCl+k7Clwo= github.com/mholt/archiver/v3 v3.5.1/go.mod h1:e3dqJ7H78uzsRSEACH1joayhuSyhnonssnDhppzS1L4= -github.com/nwaples/rardecode v1.1.0 h1:vSxaY8vQhOcVr4mm5e8XllHWTiM4JF507A0Katqw7MQ= github.com/nwaples/rardecode v1.1.0/go.mod h1:5DzqNKiOdpKKBH87u8VlvAnPZMXcGRhxWkRpHbbfGS0= github.com/nwaples/rardecode v1.1.3 h1:cWCaZwfM5H7nAD6PyEdcVnczzV8i/JtotnyW/dD9lEc= github.com/nwaples/rardecode v1.1.3/go.mod h1:5DzqNKiOdpKKBH87u8VlvAnPZMXcGRhxWkRpHbbfGS0= -github.com/pierrec/lz4/v4 v4.1.2 h1:qvY3YFXRQE/XB8MlLzJH7mSzBs74eA2gg52YTk6jUPM= github.com/pierrec/lz4/v4 v4.1.2/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= github.com/pierrec/lz4/v4 v4.1.21 h1:yOVMLb6qSIDP67pl/5F7RepeKYu/VmTyEXvuMI5d9mQ= github.com/pierrec/lz4/v4 v4.1.21/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY= +github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= +github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= +github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8= +github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/ulikunitz/xz v0.5.8/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= github.com/ulikunitz/xz v0.5.9/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= -github.com/ulikunitz/xz v0.5.10 h1:t92gobL9l3HE202wg3rlk19F6X+JOxl9BBrCCMYEYd8= -github.com/ulikunitz/xz v0.5.10/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= github.com/ulikunitz/xz v0.5.11 h1:kpFauv27b6ynzBNT/Xy+1k+fK4WswhN/6PN5WhFAGw8= github.com/ulikunitz/xz v0.5.11/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= +github.com/uwu-tools/magex v0.10.0 h1:eDDHw9izUPXEKXejY26VCtTK4LjuDoGkyWpgGscFO80= +github.com/uwu-tools/magex v0.10.0/go.mod h1:TrSEhrL1xHfJVy6n05AUwFdcQndgwrbgL5ybPNKWmVY= github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 h1:nIPpBwaJSVYIxUFsDv3M8ofmx9yWTog9BfvIu0q41lo= github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8/go.mod h1:HUYIGzjTL3rfEspMxjDjgmT5uz5wzYJKVo23qUhYTos= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c h1:5KslGYwFpkhGh+Q16bwMP3cOontH8FOep7tGV86Y7SQ= @@ -73,5 +62,5 @@ gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gopkg.in/yaml.v3 v3.0.0 h1:hjy8E9ON/egN1tAYqKb61G10WtihqetD4sz2H+8nIeA= -gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/magefile.go b/magefile.go index 789d70f..b99ef16 100644 --- a/magefile.go +++ b/magefile.go @@ -8,8 +8,8 @@ import ( "get.porter.sh/magefiles/git" "get.porter.sh/magefiles/porter" "get.porter.sh/magefiles/tools" - "github.com/carolynvs/magex/mgx" - "github.com/carolynvs/magex/shx" + "github.com/uwu-tools/magex/mgx" + "github.com/uwu-tools/magex/shx" "github.com/magefile/mage/mg" ) diff --git a/mixins/magefile.go b/mixins/magefile.go index 531e7b4..015512f 100644 --- a/mixins/magefile.go +++ b/mixins/magefile.go @@ -8,9 +8,9 @@ import ( "get.porter.sh/magefiles/ci" "get.porter.sh/magefiles/porter" "get.porter.sh/magefiles/releases" - "github.com/carolynvs/magex/mgx" - "github.com/carolynvs/magex/shx" - "github.com/carolynvs/magex/xplat" + "github.com/uwu-tools/magex/mgx" + "github.com/uwu-tools/magex/shx" + "github.com/uwu-tools/magex/xplat" "github.com/magefile/mage/mg" ) diff --git a/porter/config.go b/porter/config.go index 3e3f047..527ce93 100644 --- a/porter/config.go +++ b/porter/config.go @@ -5,7 +5,7 @@ import ( "os" "path/filepath" - "github.com/carolynvs/magex/xplat" + "github.com/uwu-tools/magex/xplat" ) var ( diff --git a/porter/config_test.go b/porter/config_test.go index 7896f91..eca1fa1 100644 --- a/porter/config_test.go +++ b/porter/config_test.go @@ -5,7 +5,7 @@ import ( "path/filepath" "testing" - "github.com/carolynvs/magex/xplat" + "github.com/uwu-tools/magex/xplat" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/porter/porter.go b/porter/porter.go index 2368e59..0834d4a 100644 --- a/porter/porter.go +++ b/porter/porter.go @@ -6,11 +6,11 @@ import ( "path/filepath" "runtime" - "github.com/carolynvs/magex/mgx" - "github.com/carolynvs/magex/pkg" - "github.com/carolynvs/magex/pkg/downloads" - "github.com/carolynvs/magex/shx" - "github.com/carolynvs/magex/xplat" + "github.com/uwu-tools/magex/mgx" + "github.com/uwu-tools/magex/pkg" + "github.com/uwu-tools/magex/pkg/downloads" + "github.com/uwu-tools/magex/shx" + "github.com/uwu-tools/magex/xplat" ) var ( diff --git a/porter/porter_test.go b/porter/porter_test.go index e25c174..6dba8f4 100644 --- a/porter/porter_test.go +++ b/porter/porter_test.go @@ -5,8 +5,8 @@ import ( "path/filepath" "testing" - "github.com/carolynvs/magex/pkg" - "github.com/carolynvs/magex/xplat" + "github.com/uwu-tools/magex/pkg" + "github.com/uwu-tools/magex/xplat" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/releases/build.go b/releases/build.go index c765bff..26aaa38 100644 --- a/releases/build.go +++ b/releases/build.go @@ -6,8 +6,8 @@ import ( "path/filepath" "runtime" - "github.com/carolynvs/magex/mgx" - "github.com/carolynvs/magex/shx" + "github.com/uwu-tools/magex/mgx" + "github.com/uwu-tools/magex/shx" "golang.org/x/sync/errgroup" ) diff --git a/releases/git.go b/releases/git.go index f162e9e..f7381de 100644 --- a/releases/git.go +++ b/releases/git.go @@ -8,9 +8,9 @@ import ( "strings" "sync" - "github.com/carolynvs/magex/ci" - "github.com/carolynvs/magex/mgx" - "github.com/carolynvs/magex/shx" + "github.com/uwu-tools/magex/ci" + "github.com/uwu-tools/magex/mgx" + "github.com/uwu-tools/magex/shx" ) var ( diff --git a/releases/publish.go b/releases/publish.go index 7dbde92..5ceb9b1 100644 --- a/releases/publish.go +++ b/releases/publish.go @@ -11,8 +11,8 @@ import ( "strings" "get.porter.sh/magefiles/tools" - "github.com/carolynvs/magex/mgx" - "github.com/carolynvs/magex/shx" + "github.com/uwu-tools/magex/mgx" + "github.com/uwu-tools/magex/shx" "github.com/magefile/mage/mg" ) diff --git a/releases/publish_test.go b/releases/publish_test.go index 2e56525..fea02a0 100644 --- a/releases/publish_test.go +++ b/releases/publish_test.go @@ -8,8 +8,8 @@ import ( "testing" "get.porter.sh/magefiles/porter" - "github.com/carolynvs/magex/mgx" - "github.com/carolynvs/magex/shx" + "github.com/uwu-tools/magex/mgx" + "github.com/uwu-tools/magex/shx" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/tests/kind.go b/tests/kind.go index 883fbfe..32dc0de 100644 --- a/tests/kind.go +++ b/tests/kind.go @@ -15,9 +15,9 @@ import ( "get.porter.sh/magefiles/docker" "get.porter.sh/magefiles/tools" - "github.com/carolynvs/magex/mgx" - "github.com/carolynvs/magex/pkg" - "github.com/carolynvs/magex/shx" + "github.com/uwu-tools/magex/mgx" + "github.com/uwu-tools/magex/pkg" + "github.com/uwu-tools/magex/shx" "github.com/magefile/mage/mg" ) diff --git a/tools/install.go b/tools/install.go index 9cd72aa..d3efe24 100644 --- a/tools/install.go +++ b/tools/install.go @@ -7,10 +7,10 @@ import ( "strings" "github.com/Masterminds/semver/v3" - "github.com/carolynvs/magex/mgx" - "github.com/carolynvs/magex/pkg" - "github.com/carolynvs/magex/pkg/archive" - "github.com/carolynvs/magex/pkg/downloads" + "github.com/uwu-tools/magex/mgx" + "github.com/uwu-tools/magex/pkg" + "github.com/uwu-tools/magex/pkg/archive" + "github.com/uwu-tools/magex/pkg/downloads" ) var ( diff --git a/tools/install_test.go b/tools/install_test.go index d261426..9a311ed 100644 --- a/tools/install_test.go +++ b/tools/install_test.go @@ -6,9 +6,9 @@ import ( "testing" "get.porter.sh/magefiles/tools" - "github.com/carolynvs/magex/pkg" - "github.com/carolynvs/magex/pkg/gopath" - "github.com/carolynvs/magex/xplat" + "github.com/uwu-tools/magex/pkg" + "github.com/uwu-tools/magex/pkg/gopath" + "github.com/uwu-tools/magex/xplat" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" )