diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index 87df41d..594daf5 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -9,12 +9,12 @@ on: jobs: test: - name: Test on go ${{ matrix.go_version }} and ${{ matrix.os }} - runs-on: ${{ matrix.os }} + name: Test on go ${{ matrix.go_version }} + runs-on: ubuntu-latest strategy: matrix: - go_version: [ 1.23, 1.22, 1.21, 1.19, '1.20' ] - os: [ ubuntu-latest ] # , macOS-latest, windows-latest + go_version: [ 1.23, 1.25, 1.24 ] + # os: [ ubuntu-latest ] # , macOS-latest, windows-latest services: # https://docs.github.com/en/actions/guides/creating-redis-service-containers @@ -36,7 +36,6 @@ jobs: - name: Revive check uses: morphy2k/revive-action@v2.7.8 - if: ${{ matrix.os == 'ubuntu-latest' }} with: # Exclude patterns, separated by semicolons (optional) exclude: "./internal/..." diff --git a/driver_test.go b/driver_test.go index dcdad8b..468c2a1 100644 --- a/driver_test.go +++ b/driver_test.go @@ -7,7 +7,7 @@ import ( "github.com/gookit/cache" "github.com/gookit/goutil/dump" "github.com/gookit/goutil/strutil" - "github.com/stretchr/testify/assert" + "github.com/gookit/goutil/testutil/assert" ) func TestNewMemoryCache(t *testing.T) { @@ -150,5 +150,5 @@ func TestDefManager(t *testing.T) { is.NoError(cache.Clear()) num = cache.UnregisterAll() - is.GreaterOrEqual(1, num) + is.Gte(num, 1) } diff --git a/gcache/gcache_test.go b/gcache/gcache_test.go index accc35a..d70edfe 100644 --- a/gcache/gcache_test.go +++ b/gcache/gcache_test.go @@ -9,7 +9,7 @@ import ( "github.com/gookit/cache/gcache" "github.com/gookit/goutil/dump" "github.com/gookit/goutil/strutil" - "github.com/stretchr/testify/assert" + "github.com/gookit/goutil/testutil/assert" ) func Example() { diff --git a/go.mod b/go.mod index 8d5a138..f317e84 100644 --- a/go.mod +++ b/go.mod @@ -2,18 +2,17 @@ module github.com/gookit/cache go 1.23.0 -toolchain go1.24.1 +toolchain go1.23.1 require ( github.com/bluele/gcache v0.0.2 - github.com/bradfitz/gomemcache v0.0.0-20230124162541-5f7a7d875746 + github.com/bradfitz/gomemcache v0.0.0-20250403215159-8d39553ac7cf github.com/dgraph-io/badger v1.6.2 github.com/gomodule/redigo v1.9.2 github.com/gookit/goutil v0.7.1 github.com/gookit/gsr v0.1.1 github.com/patrickmn/go-cache v2.1.0+incompatible github.com/redis/go-redis/v9 v9.12.1 - github.com/stretchr/testify v1.10.0 github.com/syndtr/goleveldb v1.0.0 github.com/tidwall/buntdb v1.3.2 go.etcd.io/bbolt v1.4.3 @@ -22,7 +21,6 @@ require ( require ( github.com/AndreasBriese/bbloom v0.0.0-20190825152654-46b345b51c96 // indirect github.com/cespare/xxhash/v2 v2.3.0 // indirect - github.com/davecgh/go-spew v1.1.1 // indirect github.com/dgraph-io/ristretto v0.1.1 // indirect github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 // indirect github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect @@ -31,7 +29,6 @@ require ( github.com/golang/protobuf v1.5.2 // indirect github.com/golang/snappy v0.0.4 // indirect github.com/pkg/errors v0.9.1 // indirect - github.com/pmezard/go-difflib v1.0.0 // indirect github.com/tidwall/btree v1.6.0 // indirect github.com/tidwall/gjson v1.14.4 // indirect github.com/tidwall/grect v0.1.4 // indirect @@ -44,7 +41,6 @@ require ( golang.org/x/term v0.30.0 // indirect golang.org/x/text v0.23.0 // indirect google.golang.org/protobuf v1.33.0 // indirect - gopkg.in/yaml.v3 v3.0.1 // indirect ) exclude github.com/gomodule/redigo v2.0.0+incompatible diff --git a/go.sum b/go.sum index 9883173..0a279cd 100644 --- a/go.sum +++ b/go.sum @@ -5,8 +5,8 @@ github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAE github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= github.com/bluele/gcache v0.0.2 h1:WcbfdXICg7G/DGBh1PFfcirkWOQV+v077yF1pSy3DGw= github.com/bluele/gcache v0.0.2/go.mod h1:m15KV+ECjptwSPxKhOhQoAFQVtUFjTVkc3H8o0t/fp0= -github.com/bradfitz/gomemcache v0.0.0-20230124162541-5f7a7d875746 h1:wAIE/kN63Oig1DdOzN7O+k4AbFh2cCJoKMFXrwRJtzk= -github.com/bradfitz/gomemcache v0.0.0-20230124162541-5f7a7d875746/go.mod h1:H0wQNHz2YrLsuXOZozoeDmnHXkNCRmMW0gwFWDfEZDA= +github.com/bradfitz/gomemcache v0.0.0-20250403215159-8d39553ac7cf h1:TqhNAT4zKbTdLa62d2HDBFdvgSbIGB3eJE8HqhgiL9I= +github.com/bradfitz/gomemcache v0.0.0-20250403215159-8d39553ac7cf/go.mod h1:r5xuitiExdLAJ09PR7vBVENGvp4ZuTBeWTGtxuX3K+c= github.com/bsm/ginkgo/v2 v2.12.0 h1:Ny8MWAHyOepLGlLKYmXG4IEkioBysk6GpaRTLC8zwWs= github.com/bsm/ginkgo/v2 v2.12.0/go.mod h1:SwYbGRRDovPVboqFv0tPTcG1sN61LM1Z4ARdbAV9g4c= github.com/bsm/gomega v1.27.10 h1:yeMWxP2pV2fG3FgAODIY8EiRE3dy0aeFYt4l7wh6yKA= @@ -60,10 +60,8 @@ github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= -github.com/kr/pretty v0.2.0 h1:s5hAObm+yFO5uHYt5dYjxi2rXrsnmRpJx4OYvIWUaQs= github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= -github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= @@ -152,7 +150,6 @@ google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQ google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= diff --git a/gocache/gocache_test.go b/gocache/gocache_test.go index 94ece35..b22ba1d 100644 --- a/gocache/gocache_test.go +++ b/gocache/gocache_test.go @@ -9,7 +9,7 @@ import ( "github.com/gookit/cache/gocache" "github.com/gookit/goutil/dump" "github.com/gookit/goutil/strutil" - "github.com/stretchr/testify/assert" + "github.com/gookit/goutil/testutil/assert" ) func Example() { diff --git a/goredis/goredis_test.go b/goredis/goredis_test.go index e068a49..3a19756 100644 --- a/goredis/goredis_test.go +++ b/goredis/goredis_test.go @@ -8,7 +8,7 @@ import ( "github.com/gookit/cache/goredis" "github.com/gookit/goutil/dump" "github.com/gookit/goutil/strutil" - "github.com/stretchr/testify/assert" + "github.com/gookit/goutil/testutil/assert" ) func Example() { diff --git a/redis/redigo_test.go b/redis/redigo_test.go index 89ed363..1a977b3 100644 --- a/redis/redigo_test.go +++ b/redis/redigo_test.go @@ -8,7 +8,7 @@ import ( "github.com/gookit/cache/redis" "github.com/gookit/goutil/dump" "github.com/gookit/goutil/strutil" - "github.com/stretchr/testify/assert" + "github.com/gookit/goutil/testutil/assert" ) func Example() {