修复:解决分组用量 PR 的 CI 失败

恢复分组时区测试进入前的全局时区,避免污染高峰计费和支付租约测试。同步升级 Go 1.26.6 与 nanoid 3.3.18,清除后端和前端安全门禁。
This commit is contained in:
lyen1688
2026-08-14 23:25:31 +08:00
parent cb7b03795d
commit 89d826be29
6 changed files with 20 additions and 15 deletions
+2 -2
View File
@@ -32,7 +32,7 @@ jobs:
cache-dependency-path: backend/go.sum cache-dependency-path: backend/go.sum
- name: Verify Go version - name: Verify Go version
run: | run: |
go version | grep -q 'go1.26.5' go version | grep -q 'go1.26.6'
- name: Unit tests - name: Unit tests
working-directory: backend working-directory: backend
run: make test-unit run: make test-unit
@@ -72,7 +72,7 @@ jobs:
cache-dependency-path: backend/go.sum cache-dependency-path: backend/go.sum
- name: Verify Go version - name: Verify Go version
run: | run: |
go version | grep -q 'go1.26.5' go version | grep -q 'go1.26.6'
- name: golangci-lint - name: golangci-lint
uses: golangci/golangci-lint-action@v9 uses: golangci/golangci-lint-action@v9
with: with:
+1 -1
View File
@@ -115,7 +115,7 @@ jobs:
- name: Verify Go version - name: Verify Go version
run: | run: |
go version | grep -q 'go1.26.5' go version | grep -q 'go1.26.6'
# Docker setup for GoReleaser # Docker setup for GoReleaser
- name: Set up QEMU - name: Set up QEMU
+1 -1
View File
@@ -23,7 +23,7 @@ jobs:
cache-dependency-path: backend/go.sum cache-dependency-path: backend/go.sum
- name: Verify Go version - name: Verify Go version
run: | run: |
go version | grep -q 'go1.26.5' go version | grep -q 'go1.26.6'
- name: Run govulncheck - name: Run govulncheck
working-directory: backend working-directory: backend
run: | run: |
+1 -1
View File
@@ -1,6 +1,6 @@
module github.com/Wei-Shaw/sub2api module github.com/Wei-Shaw/sub2api
go 1.26.5 go 1.26.6
require ( require (
entgo.io/ent v0.14.5 entgo.io/ent v0.14.5
@@ -10,9 +10,16 @@ import (
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
) )
func useGroupUsageTestTimezone(t *testing.T, name string) {
t.Helper()
previousName := appTimezone.Name()
require.NoError(t, appTimezone.Init(name))
t.Cleanup(func() { require.NoError(t, appTimezone.Init(previousName)) })
}
func TestGroupUsageDateUsesConfiguredTimezoneBoundary(t *testing.T) { func TestGroupUsageDateUsesConfiguredTimezoneBoundary(t *testing.T) {
require.NoError(t, appTimezone.Init("America/New_York")) useGroupUsageTestTimezone(t, "America/New_York")
t.Cleanup(func() { require.NoError(t, appTimezone.Init("Asia/Shanghai")) })
beforeMidnight := time.Date(2026, 3, 9, 3, 59, 59, 0, time.UTC) beforeMidnight := time.Date(2026, 3, 9, 3, 59, 59, 0, time.UTC)
atMidnight := time.Date(2026, 3, 9, 4, 0, 0, 0, time.UTC) atMidnight := time.Date(2026, 3, 9, 4, 0, 0, 0, time.UTC)
@@ -23,8 +30,7 @@ func TestGroupUsageDateUsesConfiguredTimezoneBoundary(t *testing.T) {
} }
func TestGroupUsageParseDateUsesConfiguredTimezone(t *testing.T) { func TestGroupUsageParseDateUsesConfiguredTimezone(t *testing.T) {
require.NoError(t, appTimezone.Init("America/New_York")) useGroupUsageTestTimezone(t, "America/New_York")
t.Cleanup(func() { require.NoError(t, appTimezone.Init("Asia/Shanghai")) })
parsed, err := ParseGroupUsageDate("2026-03-08") parsed, err := ParseGroupUsageDate("2026-03-08")
require.NoError(t, err) require.NoError(t, err)
@@ -33,8 +39,7 @@ func TestGroupUsageParseDateUsesConfiguredTimezone(t *testing.T) {
} }
func TestGroupUsageYesterdayStartHandlesDST(t *testing.T) { func TestGroupUsageYesterdayStartHandlesDST(t *testing.T) {
require.NoError(t, appTimezone.Init("America/New_York")) useGroupUsageTestTimezone(t, "America/New_York")
t.Cleanup(func() { require.NoError(t, appTimezone.Init("Asia/Shanghai")) })
todayStart := time.Date(2026, 3, 9, 4, 0, 0, 0, time.UTC) todayStart := time.Date(2026, 3, 9, 4, 0, 0, 0, time.UTC)
yesterdayStart := GroupUsageYesterdayStart(todayStart) yesterdayStart := GroupUsageYesterdayStart(todayStart)
+4 -4
View File
@@ -3322,8 +3322,8 @@ packages:
mz@2.7.0: mz@2.7.0:
resolution: {integrity: sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==} resolution: {integrity: sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==}
nanoid@3.3.17: nanoid@3.3.18:
resolution: {integrity: sha512-xQLf0A3HOMlgHq0n247/LRuAOYmB7dXJ/DvAxGvsSBij45XtBSmQycu+F8ODbHwns/XyFZagyL1+J0Offw1E0g==} resolution: {integrity: sha512-DTg4MJbGMWkfi6VZFdNt2/caMbQy4Ou+Op/hJQvGEWcnVfoA1QA+xzRKAzw9jD6+GVOOeYr/mIcuDSdug6F6+w==}
engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1} engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
hasBin: true hasBin: true
@@ -8443,7 +8443,7 @@ snapshots:
object-assign: 4.1.1 object-assign: 4.1.1
thenify-all: 1.6.0 thenify-all: 1.6.0
nanoid@3.3.17: {} nanoid@3.3.18: {}
natural-compare@1.4.0: {} natural-compare@1.4.0: {}
@@ -8641,7 +8641,7 @@ snapshots:
postcss@8.5.23: postcss@8.5.23:
dependencies: dependencies:
nanoid: 3.3.17 nanoid: 3.3.18
picocolors: 1.1.1 picocolors: 1.1.1
source-map-js: 1.2.1 source-map-js: 1.2.1