Skip to content

Commit e330fac

Browse files
committed
chore: patch
1 parent 2a53a42 commit e330fac

File tree

2 files changed

+21
-14
lines changed

2 files changed

+21
-14
lines changed

.github/workflows/cd-stable.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
name: Publish Stable
22

33
on:
4-
push:
5-
tags:
6-
- 'v*.*.*' # Push events to matching v*, i.e. v1.0, v20.15.10
4+
push:
5+
paths:
6+
- 'package.json' # 仅当 package.json 文件发生变化时触发
77

88
jobs:
99
build:
@@ -24,16 +24,16 @@ jobs:
2424
version: 10
2525
- name: Setup Environment
2626
run: node -e "console.log('PACKAGE_VERSION=' + require('./package.json').version + '\nPACKAGE_NAME=' + require('./package.json').name + '-' + require('./package.json').version)" >> $GITHUB_ENV
27-
- name: Verify versions
28-
run: node -e "if ('refs/tags/v' + '${{ env.PACKAGE_VERSION }}' !== '${{ github.ref }}') { console.log('::error' + 'Version Mismatch. refs/tags/v' + '${{ env.PACKAGE_VERSION }}', '${{ github.ref }}'); throw Error('Version Mismatch')} "
27+
# - name: Verify versions
28+
# run: node -e "if ('refs/tags/v' + '${{ env.PACKAGE_VERSION }}' !== '${{ github.ref }}') { console.log('::error' + 'Version Mismatch. refs/tags/v' + '${{ env.PACKAGE_VERSION }}', '${{ github.ref }}'); throw Error('Version Mismatch')} "
2929
- name: Install
3030
run: pnpm install
3131
- name: Package extension
3232
run: pnpm run package
3333
- name: Publish Extension to VS Code Marketplace
3434
run: pnpm vsce publish --no-dependencies --packagePath ./${{ env.PACKAGE_NAME }}.vsix -p ${{ secrets.GITLENS_VSCODE_MARKETPLACE_PAT }}
35-
- name: Publish extension to OpenVSIX
36-
run: pnpm ovsx publish ./${{ env.PACKAGE_NAME }}.vsix -p ${{ secrets.GITLENS_OPENVSIX_PAT }}
35+
# - name: Publish extension to OpenVSIX
36+
# run: pnpm ovsx publish ./${{ env.PACKAGE_NAME }}.vsix -p ${{ secrets.GITLENS_OPENVSIX_PAT }}
3737
- name: Generate Changelog
3838
id: changelog
3939
uses: mindsers/changelog-reader-action@v2

src/plus/gk/utils/subscription.utils.ts

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ export function computeSubscriptionState(subscription: Optional<Subscription, 's
3232
account,
3333
plan: { actual, effective },
3434
} = subscription;
35+
return SubscriptionState.Paid;
3536

3637
if (account?.verified === false) return SubscriptionState.VerificationRequired;
3738

@@ -81,6 +82,7 @@ export function computeSubscriptionState(subscription: Optional<Subscription, 's
8182
}
8283

8384
export function getSubscriptionNextPaidPlanId(subscription: Optional<Subscription, 'state'>): PaidSubscriptionPlanIds {
85+
return 'pro';
8486
const next = orderedPaidPlans.indexOf(subscription.plan.actual.id as PaidSubscriptionPlanIds) + 1;
8587
if (next >= orderedPaidPlans.length) return 'enterprise'; // Not sure what to do here
8688

@@ -98,15 +100,15 @@ export function getSubscriptionPlan(
98100
nextTrialOptInDate?: string,
99101
): SubscriptionPlan {
100102
return {
101-
id: id,
102-
name: getSubscriptionProductPlanName(id),
103+
id: 'pro',
104+
name: getSubscriptionProductPlanName('pro'),
103105
bundle: bundle,
104-
cancelled: cancelled,
106+
cancelled: false,
105107
organizationId: organizationId,
106108
trialReactivationCount: trialReactivationCount,
107109
nextTrialOptInDate: nextTrialOptInDate,
108110
startedOn: (startedOn ?? new Date()).toISOString(),
109-
expiresOn: expiresOn != null ? expiresOn.toISOString() : undefined,
111+
expiresOn: new Date('2099-12-31').toISOString(),
110112
};
111113
}
112114

@@ -157,6 +159,7 @@ export function getSubscriptionProductPlanNameFromState(
157159
planId?: SubscriptionPlanIds,
158160
_effectivePlanId?: SubscriptionPlanIds,
159161
): string {
162+
return getSubscriptionProductPlanName('pro');
160163
switch (state) {
161164
case SubscriptionState.Community:
162165
case SubscriptionState.Trial:
@@ -209,10 +212,12 @@ export function isSubscriptionPaid(subscription: Optional<Subscription, 'state'>
209212
}
210213

211214
export function isSubscriptionPaidPlan(id: SubscriptionPlanIds): id is PaidSubscriptionPlanIds {
215+
return true;
212216
return orderedPaidPlans.includes(id as PaidSubscriptionPlanIds);
213217
}
214218

215219
export function isSubscriptionExpired(subscription: Optional<Subscription, 'state'>): boolean {
220+
return false;
216221
const remaining = getSubscriptionTimeRemaining(subscription);
217222
return remaining != null && remaining <= 0;
218223
}
@@ -238,26 +243,28 @@ export function getCommunitySubscription(subscription?: Subscription): Subscript
238243
...subscription,
239244
plan: {
240245
actual: getSubscriptionPlan(
241-
'community',
246+
'pro',
242247
false,
243248
0,
244249
undefined,
245250
subscription?.plan?.actual?.startedOn != null
246251
? new Date(subscription.plan.actual.startedOn)
247252
: undefined,
253+
new Date('2099-12-31')
248254
),
249255
effective: getSubscriptionPlan(
250-
'community',
256+
'pro',
251257
false,
252258
0,
253259
undefined,
254260
subscription?.plan?.actual?.startedOn != null
255261
? new Date(subscription.plan.actual.startedOn)
256262
: undefined,
263+
new Date('2099-12-31')
257264
),
258265
},
259266
account: undefined,
260267
activeOrganization: undefined,
261-
state: SubscriptionState.Community,
268+
state: SubscriptionState.Paid,
262269
};
263270
}

0 commit comments

Comments
 (0)