Skip to content

Commit

Permalink
test: use unified github action yml (#720)
Browse files Browse the repository at this point in the history
  • Loading branch information
Layouwen authored Aug 27, 2024
1 parent d5386b7 commit 618994e
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 117 deletions.
119 changes: 5 additions & 114 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -1,115 +1,6 @@
name: CI

on: ['push', 'pull_request']

name: ✅ test
on: [push, pull_request]
jobs:
setup:
runs-on: ubuntu-latest
steps:
- name: checkout
uses: actions/checkout@v4

- uses: actions/setup-node@v4
with:
node-version: '20'

- name: cache package-lock.json
uses: actions/cache@v4
with:
path: package-temp-dir
key: lock-${{ github.sha }}

- name: create package-lock.json
run: npm i --package-lock-only --legacy-peer-deps

- name: hack for singe file
run: |
if [ ! -d "package-temp-dir" ]; then
mkdir package-temp-dir
fi
cp package-lock.json package-temp-dir
- name: cache node_modules
id: node_modules_cache_id
uses: actions/cache@v4
with:
path: node_modules
key: node_modules-${{ hashFiles('**/package-temp-dir/package-lock.json') }}

- name: install
if: steps.node_modules_cache_id.outputs.cache-hit != 'true'
run: npm i

lint:
runs-on: ubuntu-latest
steps:
- name: checkout
uses: actions/checkout@v4

- name: restore cache from package-lock.json
uses: actions/cache@v4
with:
path: package-temp-dir
key: lock-${{ github.sha }}

- name: restore cache from node_modules
uses: actions/cache@v4
with:
path: node_modules
key: node_modules-${{ hashFiles('**/package-temp-dir/package-lock.json') }}

- name: lint
run: npm run lint

needs: setup

compile:
runs-on: ubuntu-latest
steps:
- name: checkout
uses: actions/checkout@v4

- name: restore cache from package-lock.json
uses: actions/cache@v4
with:
path: package-temp-dir
key: lock-${{ github.sha }}

- name: restore cache from node_modules
uses: actions/cache@v4
with:
path: node_modules
key: node_modules-${{ hashFiles('**/package-temp-dir/package-lock.json') }}

- name: compile
run: npm run compile

needs: setup

coverage:
runs-on: ubuntu-latest
steps:
- name: checkout
uses: actions/checkout@v4

- name: restore cache from package-lock.json
uses: actions/cache@v4
with:
path: package-temp-dir
key: lock-${{ github.sha }}

- name: restore cache from node_modules
uses: actions/cache@v4
with:
path: node_modules
key: node_modules-${{ hashFiles('**/package-temp-dir/package-lock.json') }}

- name: coverage
run: npm test -- --coverage

- name: Upload coverage to Codecov
uses: codecov/codecov-action@v4
with:
token: ${{ secrets.CODECOV_TOKEN }}

needs: setup
test:
uses: react-component/rc-test/.github/workflows/test.yml@main
secrets: inherit
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,5 @@
.env.local
.dumi/
package-lock.json

bun.lockb
2 changes: 2 additions & 0 deletions bunfig.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[install]
peer = false
3 changes: 2 additions & 1 deletion docs/examples/stateForm-list-draggable.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,15 @@ const Draggable: React.FunctionComponent<DraggableProps> = ({ id, index, move, c
opacity: isDragging ? 0.5 : 1,
}}
>
{children}
{children as React.ReactElement}
</div>
);
};
const Demo = () => {
const [form] = useForm();

return (
// @ts-ignore https://github.com/react-dnd/react-dnd/issues/3636
<DndProvider backend={HTML5Backend}>
<div>
<h3>Draggable List of Form</h3>
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
"prettier": "^3.1.0",
"rc-test": "^7.0.15",
"react": "^18.0.0",
"react-dnd": "^16.0.1",
"react-dnd": "^8.0.3",
"react-dnd-html5-backend": "^8.0.3",
"react-dom": "^18.0.0",
"react-redux": "^9.0.4",
Expand Down
2 changes: 1 addition & 1 deletion tests/common/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ export function matchError(
return;
}

export function matchArray(source: any[], target: any[], matchKey: React.Key) {
export function matchArray(source: any[], target: any[], matchKey: string | number) {
expect(matchKey).toBeTruthy();

try {
Expand Down

0 comments on commit 618994e

Please sign in to comment.