Skip to content

Commit

Permalink
Merge pull request #505 from oceanbase/master
Browse files Browse the repository at this point in the history
[Feature Branch] chore: Merge master branch
  • Loading branch information
dengfuping authored Mar 11, 2024
2 parents f39d653 + 6dd1d62 commit 7108641
Show file tree
Hide file tree
Showing 5 changed files with 69 additions and 6 deletions.
5 changes: 5 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,11 @@ updates:
directory: "/" # Location of package manifests
schedule:
interval: "weekly"
commit-message:
prefix: "[Feature Branch] "
labels:
- "dependencies"
- "Feature Branch"
ignore:
- dependency-name: "@antv/g6"
# execa latest 7.x works only in ES module
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml → .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: CI
name: Build

on: [push, pull_request]
on: [pull_request]

jobs:
build:
Expand All @@ -21,7 +21,7 @@ jobs:
uses: pnpm/action-setup@v2
with:
version: 8.6.0
- name: CI
- name: Run build
run: |
pnpm install
pnpm run ci
pnpm run build
31 changes: 31 additions & 0 deletions .github/workflows/sync-feature-branch.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
name: Sync Feature Branch

on:
# Runs on pushes targeting the default branch
push:
branches: ['feature']

# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:

jobs:
build:
if: github.repository == 'oceanbase/oceanbase-design'
runs-on: ${{ matrix.os }}
strategy:
matrix:
node-version: [16.x]
os: [ubuntu-latest]
fail-fast: false
steps:
- name: Checkout
uses: actions/checkout@v3
with:
ref: feature
# Sync `feature` branch from oceanbase/oceanbase-design to dengfuping/oceanbase-design
# `feature` branch will be deployed auto in Vercel after sync success
- name: Sync feature branch
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
git push https://dengfuping:[email protected]/dengfuping/oceanbase-design feature:feature
27 changes: 27 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
name: Test

on: [pull_request]

jobs:
test:
if: github.repository == 'oceanbase/oceanbase-design'
runs-on: ${{ matrix.os }}
strategy:
matrix:
node-version: [16.x]
os: [ubuntu-latest]
fail-fast: false
steps:
- name: Checkout
uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: 16
- name: Install pnpm
uses: pnpm/action-setup@v2
with:
version: 8.6.0
- name: Run test
run: |
pnpm install
pnpm run test
4 changes: 2 additions & 2 deletions packages/ui/src/Password/locale/en-US.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ export default {
placeholder: 'Please enter the password',
generatePlaceholder: 'Enter or randomly generate',
randomlyGenerate: 'Randomly generate',
pleaseKeepYourPasswordIn: 'lease keep your password in mind.',
pleaseKeepYourPasswordIn: 'Please remember your password in mind.',
copySuccessfully: 'Copied',
copyPassword: ' copy password ',
andKeepItProperly: 'and keep it properly',
andKeepItProperly: 'and save it securely',
};

0 comments on commit 7108641

Please sign in to comment.