diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ade2d31c..59aaf7f2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,7 +25,7 @@ jobs: runs-on: "${{ matrix.os }}" strategy: matrix: - go-version: ['1.15', '1.16', '1.17'] + go-version: ['1.15', '1.16', '1.17', '1.18'] os: [ubuntu-latest] services: diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index cf0fd193..89fba992 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -3,6 +3,7 @@ ## Added: - 添加用于执行定时任务的 CronJobExt +- 添加 golang 1.18 测试 # 1.0.0 (2022-01-05) diff --git a/extensions/cronjobext/cronjobext.go b/extensions/cronjobext/cronjobext.go index cd443b58..711a37f6 100644 --- a/extensions/cronjobext/cronjobext.go +++ b/extensions/cronjobext/cronjobext.go @@ -62,7 +62,6 @@ func (t *CronJobExt) Init(app *gobay.Application) error { t.config = &Config{AsyncTaskConfig: &config.Config{}, TimeZone: "UTC", HealthCheckPort: 5000} if err := extCfg.Unmarshal(t.config, func(config *mapstructure.DecoderConfig) { config.TagName = "yaml" - config.Squash = true }); err != nil { return err } @@ -112,8 +111,8 @@ func (t *CronJobExt) Close() error { type CronJobSchedulerType string const ( - DurationScheduler = "duration" // time.ParseDuration style expressions - CronScheduler = "crontab" // crontab style expressions + DurationScheduler CronJobSchedulerType = "duration" // time.ParseDuration style expressions + CronScheduler CronJobSchedulerType = "crontab" // crontab style expressions ) type CronJobTask struct { diff --git a/go.mod b/go.mod index 6aea7b42..4cc42ac7 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( github.com/elastic/go-windows v1.0.1 // indirect github.com/facebook/ent v0.4.0 github.com/getsentry/sentry-go v0.13.0 - github.com/go-co-op/gocron v1.15.0 + github.com/go-co-op/gocron v1.17.1 github.com/go-openapi/runtime v0.23.2 github.com/go-redis/redis v6.15.9+incompatible github.com/go-sql-driver/mysql v1.5.1-0.20200311113236-681ffa848bae @@ -30,13 +30,14 @@ require ( github.com/spf13/viper v1.7.1 github.com/streadway/amqp v1.0.0 github.com/stretchr/objx v0.4.0 - github.com/stretchr/testify v1.7.5 + github.com/stretchr/testify v1.8.0 github.com/vmihailenco/msgpack v4.0.4+incompatible go.elastic.co/apm v1.13.0 go.elastic.co/apm/module/apmgoredis v1.9.0 go.elastic.co/apm/module/apmgrpc v1.9.0 go.elastic.co/apm/module/apmsql v1.9.0 golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 // indirect + golang.org/x/sync v0.1.0 // indirect golang.org/x/tools v0.1.5 // indirect google.golang.org/grpc v1.35.0 google.golang.org/grpc/examples v0.0.0-20200925170654-e6c98a478e62 // indirect diff --git a/go.sum b/go.sum index 526676e5..2bd33456 100644 --- a/go.sum +++ b/go.sum @@ -157,8 +157,8 @@ github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm github.com/gin-gonic/gin v1.7.7/go.mod h1:axIBovoeJpVj8S3BwE0uPMTeReE4+AfFtqpqaZ1qq1U= github.com/go-bindata/go-bindata v1.0.1-0.20190711162640-ee3c2418e368/go.mod h1:7xCgX1lzlrXPHkfvn3EhumqHkmSlzt8at9q7v0ax19c= github.com/go-check/check v0.0.0-20180628173108-788fd7840127/go.mod h1:9ES+weclKsC9YodN5RgxqK/VD9HM9JsCSh7rNhMZE98= -github.com/go-co-op/gocron v1.15.0 h1:XmiPazahD9aq0/QdK5toCVHfgTXfrZ/s83RpAgzr6SM= -github.com/go-co-op/gocron v1.15.0/go.mod h1:On9zUZTv7FBeuj9D/cdYyAWcPUiLqqAx7nsPHd0EmKM= +github.com/go-co-op/gocron v1.17.1 h1:oEu3xGNVn9IGukN3JPzOsfaBoTGYmUVHtR9d1cv1cq8= +github.com/go-co-op/gocron v1.17.1/go.mod h1:IpDBSaJOVfFw7hXZuTag3SCSkqazXBBUkbQ1m1aesBs= github.com/go-errors/errors v1.0.1 h1:LUHzmkK3GUKUrL/1gfBUxAHzcev3apQlezX/+O7ma6w= github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q= github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= @@ -684,8 +684,8 @@ github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.7.5 h1:s5PTfem8p8EbKQOctVV53k6jCJt3UX4IEJzwh+C324Q= -github.com/stretchr/testify v1.7.5/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= +github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk= +github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stvp/tempredis v0.0.0-20181119212430-b82af8480203 h1:QVqDTf3h2WHt08YuiTGPZLls0Wq99X9bWd0Q5ZSBesM= github.com/stvp/tempredis v0.0.0-20181119212430-b82af8480203/go.mod h1:oqN97ltKNihBbwlX8dLpwxCl3+HnXKV/R0e+sRLd9C8= github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s= @@ -914,8 +914,9 @@ golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20210220032951-036812b2e83c h1:5KslGYwFpkhGh+Q16bwMP3cOontH8FOep7tGV86Y7SQ= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o= +golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=