Skip to content

Commit 5e060b2

Browse files
touwaerioltouwaeriol
committed
Merge remote-tracking branch 'upstream/main' into feat/channel-insights
# Conflicts: # backend/cmd/server/wire_gen.go
2 parents 6f04c25 + 0a80ec8 commit 5e060b2

106 files changed

Lines changed: 5103 additions & 1421 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/release.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -246,10 +246,10 @@ jobs:
246246
if [ -n "$DOCKERHUB_USERNAME" ]; then
247247
DOCKER_IMAGE="${DOCKERHUB_USERNAME}/sub2api"
248248
MESSAGE+="# Docker Hub"$'\n'
249-
MESSAGE+="docker pull ${DOCKER_IMAGE}:${TAG_NAME}"$'\n'
249+
MESSAGE+="docker pull ${DOCKER_IMAGE}:${VERSION}"$'\n'
250250
MESSAGE+="# GitHub Container Registry"$'\n'
251251
fi
252-
MESSAGE+="docker pull ${GHCR_IMAGE}:${TAG_NAME}"$'\n'
252+
MESSAGE+="docker pull ${GHCR_IMAGE}:${VERSION}"$'\n'
253253
MESSAGE+="\`\`\`"$'\n'$'\n'
254254
MESSAGE+="🔗 *相关链接:*"$'\n'
255255
MESSAGE+="• [GitHub Release](https://github.com/${REPO}/releases/tag/${TAG_NAME})"$'\n'

‎backend/cmd/server/VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.1.115
1+
0.1.116

‎backend/cmd/server/wire_gen.go‎

Lines changed: 16 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎backend/cmd/server/wire_gen_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ func TestProvideCleanup_WithMinimalDependencies_NoPanic(t *testing.T) {
4343
subscriptionExpirySvc := service.NewSubscriptionExpiryService(nil, time.Second)
4444
pricingSvc := service.NewPricingService(cfg, nil)
4545
emailQueueSvc := service.NewEmailQueueService(nil, 1)
46-
billingCacheSvc := service.NewBillingCacheService(nil, nil, nil, nil, cfg)
46+
billingCacheSvc := service.NewBillingCacheService(nil, nil, nil, nil, nil, nil, cfg)
4747
idempotencyCleanupSvc := service.NewIdempotencyCleanupService(nil, cfg)
4848
schedulerSnapshotSvc := service.NewSchedulerSnapshotService(nil, nil, nil, nil, cfg)
4949
opsSystemLogSinkSvc := service.NewOpsSystemLogSink(nil)

‎backend/ent/group.go‎

Lines changed: 12 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎backend/ent/group/group.go‎

Lines changed: 10 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎backend/ent/group/where.go‎

Lines changed: 45 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)