Skip to content

Commit

Permalink
Merge branch 'next' into switch-to-tsup
Browse files Browse the repository at this point in the history
  • Loading branch information
Shinigami92 authored Sep 17, 2023
2 parents 1769aaf + ef6334c commit bc2d845
Show file tree
Hide file tree
Showing 13 changed files with 905 additions and 91 deletions.
26 changes: 14 additions & 12 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
node_version: [18]
node_version: [20]
fail-fast: false
env:
LANG: zh_SG.UTF-8
Expand Down Expand Up @@ -117,9 +117,11 @@ jobs:

e2e-test:
runs-on: ubuntu-latest
container: cypress/browsers:node18.12.0-chrome107
container:
image: cypress/browsers:node-20.6.1-chrome-116.0.5845.187-1-ff-117.0-edge-116.0.1938.76-1
options: --user 1001
timeout-minutes: 10
name: 'E2E Doc Test: node-18, ubuntu-latest'
name: 'E2E Doc Test: node-20, ubuntu-latest'
steps:
- name: Checkout
uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
Expand All @@ -140,7 +142,7 @@ jobs:
lint:
runs-on: ubuntu-latest
timeout-minutes: 10
name: 'Lint: node-18, ubuntu-latest'
name: 'Lint: node-20, ubuntu-latest'
steps:
- name: Checkout
uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
Expand All @@ -150,10 +152,10 @@ jobs:
- name: Install pnpm
uses: pnpm/action-setup@d882d12c64e032187b2edb46d3a0d003b7a43598 # v2.4.0

- name: Set node version to 18
- name: Set node version to 20
uses: actions/setup-node@5e21ff4d9bc1a8cf6de233a3057d20ec6b3fb69d # v3.8.1
with:
node-version: 18
node-version: 20
cache: 'pnpm'

- name: Install deps
Expand All @@ -170,7 +172,7 @@ jobs:
ts-check:
runs-on: ubuntu-latest
timeout-minutes: 10
name: 'TS-Check: node-18, ubuntu-latest'
name: 'TS-Check: node-20, ubuntu-latest'
steps:
- name: Checkout
uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
Expand All @@ -180,10 +182,10 @@ jobs:
- name: Install pnpm
uses: pnpm/action-setup@d882d12c64e032187b2edb46d3a0d003b7a43598 # v2.4.0

- name: Set node version to 18
- name: Set node version to 20
uses: actions/setup-node@5e21ff4d9bc1a8cf6de233a3057d20ec6b3fb69d # v3.8.1
with:
node-version: 18
node-version: 20
cache: 'pnpm'

- name: Install deps
Expand All @@ -197,7 +199,7 @@ jobs:
codecov:
runs-on: ubuntu-latest
timeout-minutes: 10
name: 'Codecov: node-18, ubuntu-latest'
name: 'Codecov: node-20, ubuntu-latest'
steps:
- name: Checkout
uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
Expand All @@ -207,10 +209,10 @@ jobs:
- name: Install pnpm
uses: pnpm/action-setup@d882d12c64e032187b2edb46d3a0d003b7a43598 # v2.4.0

- name: Set node version to 18
- name: Set node version to 20
uses: actions/setup-node@5e21ff4d9bc1a8cf6de233a3057d20ec6b3fb69d # v3.8.1
with:
node-version: 18
node-version: 20
cache: 'pnpm'

- name: Install deps
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
check-code-generation:
runs-on: ubuntu-latest
timeout-minutes: 10
name: 'Check Code Generation: node-18, ubuntu-latest'
name: 'Check Code Generation: node-20, ubuntu-latest'
permissions:
pull-requests: write
steps:
Expand All @@ -22,10 +22,10 @@ jobs:
- name: Install pnpm
uses: pnpm/action-setup@d882d12c64e032187b2edb46d3a0d003b7a43598 # v2.4.0

- name: Set node version to 18
- name: Set node version to 20
uses: actions/setup-node@5e21ff4d9bc1a8cf6de233a3057d20ec6b3fb69d # v3.8.1
with:
node-version: 18
node-version: 20
cache: 'pnpm'

- name: Install deps
Expand Down
10 changes: 10 additions & 0 deletions src/locales/zh_CN/finance/account_type.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
export default [
'支票',
'储蓄',
'货币市场',
'投资',
'房屋贷款',
'信用卡',
'汽车贷款',
'个人贷款',
];
14 changes: 14 additions & 0 deletions src/locales/zh_CN/finance/credit_card/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
/*
* This file is automatically generated.
* Run 'pnpm run generate:locales' to update.
*/
import type { FinanceDefinition } from '../../../..';
import mastercard from './mastercard';
import visa from './visa';

const credit_card: FinanceDefinition['credit_card'] = {
mastercard,
visa,
};

export default credit_card;
1 change: 1 addition & 0 deletions src/locales/zh_CN/finance/credit_card/mastercard.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export default ['5[1-5]##-####-####-###L'];
1 change: 1 addition & 0 deletions src/locales/zh_CN/finance/credit_card/visa.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export default ['4###########L', '4###-####-####-###L'];
Loading

0 comments on commit bc2d845

Please sign in to comment.