diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index 378001f..1b546a3 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - go: [ '1.22', '1.21', '1.20' ] + go: [ '1.24', '1.23', '1.22', '1.21', '1.20' ] steps: - uses: actions/checkout@v4 @@ -47,5 +47,5 @@ jobs: run: ./bin/task test-coverage - name: Post run - run: ./cc-test-reporter after-build format-coverage -t gocov --prefix github.com/stretchr/objx .cover/c.out --exit-code $? + run: ./cc-test-reporter after-build format-coverage -t gocov --prefix github.com/stretchr/objx c.out --exit-code $? diff --git a/Taskfile.yml b/Taskfile.yml index 8a79e8d..fbd71d2 100644 --- a/Taskfile.yml +++ b/Taskfile.yml @@ -7,21 +7,21 @@ tasks: lint: desc: Checks code style cmds: - - gofmt -d -s *.go - - go vet ./... + - gofmt -d -s . + - find -name go.mod -execdir go vet ./... \; silent: true lint-fix: desc: Fixes code style cmds: - - gofmt -w -s *.go + - gofmt -w -s . test: desc: Runs go tests cmds: - - go test -race ./... + - find -name go.mod -execdir go test -race ./... \; test-coverage: desc: Runs go tests and calculates test coverage cmds: - - go test -race -coverprofile=c.out ./... + - find -name go.mod -execdir go test -race -coverprofile=c.out ./... \; diff --git a/go.mod b/go.mod index 5fd993e..bed99ab 100644 --- a/go.mod +++ b/go.mod @@ -2,12 +2,3 @@ module github.com/stretchr/objx go 1.20 -require github.com/stretchr/testify v1.10.0 - -require ( - github.com/davecgh/go-spew v1.1.1 // indirect - github.com/pmezard/go-difflib v1.0.0 // indirect - gopkg.in/yaml.v3 v3.0.1 // indirect -) - -exclude github.com/stretchr/testify v1.8.0 diff --git a/go.sum b/go.sum index 713a0b4..e69de29 100644 --- a/go.sum +++ b/go.sum @@ -1,10 +0,0 @@ -github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= -github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -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/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA= -github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= -gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= -gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -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/accessors_test.go b/internal/tests/accessors_test.go similarity index 100% rename from accessors_test.go rename to internal/tests/accessors_test.go diff --git a/conversions_test.go b/internal/tests/conversions_test.go similarity index 100% rename from conversions_test.go rename to internal/tests/conversions_test.go diff --git a/fixture_test.go b/internal/tests/fixture_test.go similarity index 100% rename from fixture_test.go rename to internal/tests/fixture_test.go diff --git a/internal/tests/go.mod b/internal/tests/go.mod new file mode 100644 index 0000000..ea88c19 --- /dev/null +++ b/internal/tests/go.mod @@ -0,0 +1,16 @@ +module github.com/stretchr/objx/internal/tests + +go 1.20 + +require ( + github.com/stretchr/objx v0.5.2 + github.com/stretchr/testify v1.10.0 +) + +require ( + github.com/davecgh/go-spew v1.1.1 // indirect + github.com/pmezard/go-difflib v1.0.0 // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect +) + +replace github.com/stretchr/objx => ../.. diff --git a/internal/tests/go.sum b/internal/tests/go.sum new file mode 100644 index 0000000..713a0b4 --- /dev/null +++ b/internal/tests/go.sum @@ -0,0 +1,10 @@ +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +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/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA= +github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +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/map_test.go b/internal/tests/map_test.go similarity index 100% rename from map_test.go rename to internal/tests/map_test.go diff --git a/mutations_test.go b/internal/tests/mutations_test.go similarity index 100% rename from mutations_test.go rename to internal/tests/mutations_test.go diff --git a/security_test.go b/internal/tests/security_test.go similarity index 100% rename from security_test.go rename to internal/tests/security_test.go diff --git a/simple_example_test.go b/internal/tests/simple_example_test.go similarity index 100% rename from simple_example_test.go rename to internal/tests/simple_example_test.go diff --git a/tests_test.go b/internal/tests/tests_test.go similarity index 100% rename from tests_test.go rename to internal/tests/tests_test.go diff --git a/type_specific_codegen_test.go b/internal/tests/type_specific_codegen_test.go similarity index 100% rename from type_specific_codegen_test.go rename to internal/tests/type_specific_codegen_test.go diff --git a/type_specific_test.go b/internal/tests/type_specific_test.go similarity index 100% rename from type_specific_test.go rename to internal/tests/type_specific_test.go diff --git a/value_test.go b/internal/tests/value_test.go similarity index 100% rename from value_test.go rename to internal/tests/value_test.go