Skip to content

Commit 618994e

Browse files
authored
test: use unified github action yml (#720)
1 parent d5386b7 commit 618994e

File tree

6 files changed

+13
-117
lines changed

6 files changed

+13
-117
lines changed

.github/workflows/main.yml

Lines changed: 5 additions & 114 deletions
Original file line numberDiff line numberDiff line change
@@ -1,115 +1,6 @@
1-
name: CI
2-
3-
on: ['push', 'pull_request']
4-
1+
name: ✅ test
2+
on: [push, pull_request]
53
jobs:
6-
setup:
7-
runs-on: ubuntu-latest
8-
steps:
9-
- name: checkout
10-
uses: actions/checkout@v4
11-
12-
- uses: actions/setup-node@v4
13-
with:
14-
node-version: '20'
15-
16-
- name: cache package-lock.json
17-
uses: actions/cache@v4
18-
with:
19-
path: package-temp-dir
20-
key: lock-${{ github.sha }}
21-
22-
- name: create package-lock.json
23-
run: npm i --package-lock-only --legacy-peer-deps
24-
25-
- name: hack for singe file
26-
run: |
27-
if [ ! -d "package-temp-dir" ]; then
28-
mkdir package-temp-dir
29-
fi
30-
cp package-lock.json package-temp-dir
31-
32-
- name: cache node_modules
33-
id: node_modules_cache_id
34-
uses: actions/cache@v4
35-
with:
36-
path: node_modules
37-
key: node_modules-${{ hashFiles('**/package-temp-dir/package-lock.json') }}
38-
39-
- name: install
40-
if: steps.node_modules_cache_id.outputs.cache-hit != 'true'
41-
run: npm i
42-
43-
lint:
44-
runs-on: ubuntu-latest
45-
steps:
46-
- name: checkout
47-
uses: actions/checkout@v4
48-
49-
- name: restore cache from package-lock.json
50-
uses: actions/cache@v4
51-
with:
52-
path: package-temp-dir
53-
key: lock-${{ github.sha }}
54-
55-
- name: restore cache from node_modules
56-
uses: actions/cache@v4
57-
with:
58-
path: node_modules
59-
key: node_modules-${{ hashFiles('**/package-temp-dir/package-lock.json') }}
60-
61-
- name: lint
62-
run: npm run lint
63-
64-
needs: setup
65-
66-
compile:
67-
runs-on: ubuntu-latest
68-
steps:
69-
- name: checkout
70-
uses: actions/checkout@v4
71-
72-
- name: restore cache from package-lock.json
73-
uses: actions/cache@v4
74-
with:
75-
path: package-temp-dir
76-
key: lock-${{ github.sha }}
77-
78-
- name: restore cache from node_modules
79-
uses: actions/cache@v4
80-
with:
81-
path: node_modules
82-
key: node_modules-${{ hashFiles('**/package-temp-dir/package-lock.json') }}
83-
84-
- name: compile
85-
run: npm run compile
86-
87-
needs: setup
88-
89-
coverage:
90-
runs-on: ubuntu-latest
91-
steps:
92-
- name: checkout
93-
uses: actions/checkout@v4
94-
95-
- name: restore cache from package-lock.json
96-
uses: actions/cache@v4
97-
with:
98-
path: package-temp-dir
99-
key: lock-${{ github.sha }}
100-
101-
- name: restore cache from node_modules
102-
uses: actions/cache@v4
103-
with:
104-
path: node_modules
105-
key: node_modules-${{ hashFiles('**/package-temp-dir/package-lock.json') }}
106-
107-
- name: coverage
108-
run: npm test -- --coverage
109-
110-
- name: Upload coverage to Codecov
111-
uses: codecov/codecov-action@v4
112-
with:
113-
token: ${{ secrets.CODECOV_TOKEN }}
114-
115-
needs: setup
4+
test:
5+
uses: react-component/rc-test/.github/workflows/test.yml@main
6+
secrets: inherit

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,3 +28,5 @@
2828
.env.local
2929
.dumi/
3030
package-lock.json
31+
32+
bun.lockb

bunfig.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
[install]
2+
peer = false

docs/examples/stateForm-list-draggable.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,15 @@ const Draggable: React.FunctionComponent<DraggableProps> = ({ id, index, move, c
3131
opacity: isDragging ? 0.5 : 1,
3232
}}
3333
>
34-
{children}
34+
{children as React.ReactElement}
3535
</div>
3636
);
3737
};
3838
const Demo = () => {
3939
const [form] = useForm();
4040

4141
return (
42+
// @ts-ignore https://github.com/react-dnd/react-dnd/issues/3636
4243
<DndProvider backend={HTML5Backend}>
4344
<div>
4445
<h3>Draggable List of Form</h3>

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
"prettier": "^3.1.0",
7575
"rc-test": "^7.0.15",
7676
"react": "^18.0.0",
77-
"react-dnd": "^16.0.1",
77+
"react-dnd": "^8.0.3",
7878
"react-dnd-html5-backend": "^8.0.3",
7979
"react-dom": "^18.0.0",
8080
"react-redux": "^9.0.4",

tests/common/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ export function matchError(
6868
return;
6969
}
7070

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

7474
try {

0 commit comments

Comments
 (0)