From fb166fb3e4a7d7f12373f892f0490cc3edf30c9a Mon Sep 17 00:00:00 2001 From: Aaron Liu <912394456@qq.com> Date: Sat, 27 May 2023 14:06:19 +0800 Subject: [PATCH] release: 3.8.0-beta1 --- assets | 2 +- pkg/conf/version.go | 6 +++--- pkg/thumb/pipeline.go | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/assets b/assets index 5e66c6fd9c..0feca325f4 160000 --- a/assets +++ b/assets @@ -1 +1 @@ -Subproject commit 5e66c6fd9c8b50f31a7a2d1f1e77ef13543ee366 +Subproject commit 0feca325f4b74d1c99f71ebced032f50da689da0 diff --git a/pkg/conf/version.go b/pkg/conf/version.go index 8d6229170a..22dd4dd721 100644 --- a/pkg/conf/version.go +++ b/pkg/conf/version.go @@ -1,13 +1,13 @@ package conf // BackendVersion 当前后端版本号 -var BackendVersion = "3.7.1" +var BackendVersion = "3.8.0-beta1" // RequiredDBVersion 与当前版本匹配的数据库版本 -var RequiredDBVersion = "3.7.1" +var RequiredDBVersion = "3.8.0-beta1" // RequiredStaticVersion 与当前版本匹配的静态资源版本 -var RequiredStaticVersion = "3.7.1" +var RequiredStaticVersion = "3.8.0-beta1" // IsPro 是否为Pro版本 var IsPro = "false" diff --git a/pkg/thumb/pipeline.go b/pkg/thumb/pipeline.go index c3c5b7c6d1..8ea1fd5d90 100644 --- a/pkg/thumb/pipeline.go +++ b/pkg/thumb/pipeline.go @@ -73,7 +73,7 @@ func (p GeneratorList) Generate(ctx context.Context, file io.Reader, src, name s continue } - if res.Continue { + if res != nil && res.Continue { util.Log().Debug("Generator %s for %s returned continue, passing through to next generator.", reflect.TypeOf(generator).String(), name) // defer cleanup funcs