From b8e1fc85f73e51cc9387a11d2f2a3812d2fdc78f Mon Sep 17 00:00:00 2001 From: Avan Date: Tue, 13 Aug 2024 17:43:38 +0800 Subject: [PATCH 1/9] test: use codecov/codecov-action --- .github/workflows/react-component-ci.yml | 57 +++++++++++++----------- 1 file changed, 30 insertions(+), 27 deletions(-) diff --git a/.github/workflows/react-component-ci.yml b/.github/workflows/react-component-ci.yml index 5ffd2073..2097f2a7 100644 --- a/.github/workflows/react-component-ci.yml +++ b/.github/workflows/react-component-ci.yml @@ -1,30 +1,26 @@ name: CI -on: - push: - branches: [ master ] - pull_request: - branches: [ master ] +on: ['push', 'pull_request'] jobs: setup: runs-on: ubuntu-latest steps: - name: checkout - uses: actions/checkout@master + uses: actions/checkout@v4 - - uses: actions/setup-node@v1 + - uses: actions/setup-node@v4 with: - node-version: '12' + node-version: '20' - name: cache package-lock.json - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: package-temp-dir key: lock-${{ github.sha }} - name: create package-lock.json - run: npm i --package-lock-only + run: npm i --package-lock-only --ignore-scripts - name: hack for singe file run: | @@ -35,7 +31,7 @@ jobs: - name: cache node_modules id: node_modules_cache_id - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: node_modules key: node_modules-${{ hashFiles('**/package-temp-dir/package-lock.json') }} @@ -43,22 +39,21 @@ jobs: - name: install if: steps.node_modules_cache_id.outputs.cache-hit != 'true' run: npm ci - + lint: runs-on: ubuntu-latest - needs: setup steps: - name: checkout - uses: actions/checkout@master + uses: actions/checkout@v4 - name: restore cache from package-lock.json - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: package-temp-dir key: lock-${{ github.sha }} - name: restore cache from node_modules - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: node_modules key: node_modules-${{ hashFiles('**/package-temp-dir/package-lock.json') }} @@ -66,47 +61,55 @@ jobs: - name: lint run: npm run lint - + needs: setup + compile: runs-on: ubuntu-latest - needs: setup steps: - name: checkout - uses: actions/checkout@master + uses: actions/checkout@v4 - name: restore cache from package-lock.json - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: package-temp-dir key: lock-${{ github.sha }} - name: restore cache from node_modules - uses: actions/cache@v2 + 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 - needs: setup steps: - name: checkout - uses: actions/checkout@master + uses: actions/checkout@v4 - name: restore cache from package-lock.json - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: package-temp-dir key: lock-${{ github.sha }} - name: restore cache from node_modules - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: node_modules key: node_modules-${{ hashFiles('**/package-temp-dir/package-lock.json') }} - name: coverage - run: npm run coverage && bash <(curl -s https://codecov.io/bash) + run: npm test -- --coverage + + - name: Upload coverage to Codecov + uses: codecov/codecov-action@v4 + with: + token: ${{ secrets.CODECOV_TOKEN }} + + needs: setup From 9dbf293c67eaade58b3efceeb1a1365d0cb9d15d Mon Sep 17 00:00:00 2001 From: Avan Date: Thu, 15 Aug 2024 20:17:08 +0800 Subject: [PATCH 2/9] restore yml --- .github/workflows/react-component-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/react-component-ci.yml b/.github/workflows/react-component-ci.yml index 2097f2a7..9ecae29a 100644 --- a/.github/workflows/react-component-ci.yml +++ b/.github/workflows/react-component-ci.yml @@ -20,7 +20,7 @@ jobs: key: lock-${{ github.sha }} - name: create package-lock.json - run: npm i --package-lock-only --ignore-scripts + run: npm i --package-lock-only - name: hack for singe file run: | From a8e370454e64f0d2da4c57dc2a5561f940b0fcac Mon Sep 17 00:00:00 2001 From: Avan Date: Thu, 15 Aug 2024 20:31:03 +0800 Subject: [PATCH 3/9] try remote lock only --- .github/workflows/react-component-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/react-component-ci.yml b/.github/workflows/react-component-ci.yml index 9ecae29a..11c4fba8 100644 --- a/.github/workflows/react-component-ci.yml +++ b/.github/workflows/react-component-ci.yml @@ -20,7 +20,7 @@ jobs: key: lock-${{ github.sha }} - name: create package-lock.json - run: npm i --package-lock-only + run: npm i - name: hack for singe file run: | From 9b1279a0eb763e7135c95256f0bb57576c461b09 Mon Sep 17 00:00:00 2001 From: afc163 Date: Thu, 15 Aug 2024 22:47:51 +0800 Subject: [PATCH 4/9] Update .github/workflows/react-component-ci.yml --- .github/workflows/react-component-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/react-component-ci.yml b/.github/workflows/react-component-ci.yml index 11c4fba8..9ecae29a 100644 --- a/.github/workflows/react-component-ci.yml +++ b/.github/workflows/react-component-ci.yml @@ -20,7 +20,7 @@ jobs: key: lock-${{ github.sha }} - name: create package-lock.json - run: npm i + run: npm i --package-lock-only - name: hack for singe file run: | From 957c000dfab92549a5e42f6de80df81f21654add Mon Sep 17 00:00:00 2001 From: afc163 Date: Thu, 15 Aug 2024 23:02:36 +0800 Subject: [PATCH 5/9] Update package.json --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 1f837164..d6b25d27 100644 --- a/package.json +++ b/package.json @@ -55,13 +55,13 @@ "@types/jest": "^29.4.0", "@types/react": "^18.0.0", "@types/react-dom": "^18.0.0", - "@umijs/fabric": "^3.0.0", + "@umijs/fabric": "^4.0.0", "dumi": "^2.1.1", "eslint": "^8.55.0", "eslint-plugin-jest": "^27.6.0", "eslint-plugin-unicorn": "^49.0.0", "father": "^4.1.3", - "husky": "^8.0.3", + "husky": "^9.0.0", "jest": "^29.1.2", "less": "^4.2.0", "lint-staged": "^15.0.2", From 3e74699efaafb5f8b740af49d4b76e2f097290d1 Mon Sep 17 00:00:00 2001 From: afc163 Date: Thu, 15 Aug 2024 23:05:59 +0800 Subject: [PATCH 6/9] Update react-component-ci.yml --- .github/workflows/react-component-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/react-component-ci.yml b/.github/workflows/react-component-ci.yml index 9ecae29a..2097f2a7 100644 --- a/.github/workflows/react-component-ci.yml +++ b/.github/workflows/react-component-ci.yml @@ -20,7 +20,7 @@ jobs: key: lock-${{ github.sha }} - name: create package-lock.json - run: npm i --package-lock-only + run: npm i --package-lock-only --ignore-scripts - name: hack for singe file run: | From 0f9fe93bef986dbbf848fd7c34ce1aa686a69b3b Mon Sep 17 00:00:00 2001 From: afc163 Date: Thu, 15 Aug 2024 23:10:12 +0800 Subject: [PATCH 7/9] Update .dumirc.ts --- .dumirc.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/.dumirc.ts b/.dumirc.ts index ff078b39..ae66bd47 100644 --- a/.dumirc.ts +++ b/.dumirc.ts @@ -16,7 +16,6 @@ export default defineConfig({ logo: 'https://avatars0.githubusercontent.com/u/9441414?s=200&v=4', }, outputPath: '.doc', - exportStatic: {}, base: basePath, publicPath, }); From a1bf890a8d57a05711a3b7bae0c1934684cc9ea2 Mon Sep 17 00:00:00 2001 From: afc163 Date: Thu, 15 Aug 2024 23:14:51 +0800 Subject: [PATCH 8/9] Update .github/workflows/react-component-ci.yml --- .github/workflows/react-component-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/react-component-ci.yml b/.github/workflows/react-component-ci.yml index 2097f2a7..35b289d3 100644 --- a/.github/workflows/react-component-ci.yml +++ b/.github/workflows/react-component-ci.yml @@ -20,7 +20,7 @@ jobs: key: lock-${{ github.sha }} - name: create package-lock.json - run: npm i --package-lock-only --ignore-scripts + run: npm i --package-lock-only --ignore-scripts --legacy-peer-deps - name: hack for singe file run: | From 2f2e6f33ca5529ad5d8049aa551d66b6091d6cc9 Mon Sep 17 00:00:00 2001 From: afc163 Date: Thu, 15 Aug 2024 23:20:13 +0800 Subject: [PATCH 9/9] Apply suggestions from code review --- .github/workflows/react-component-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/react-component-ci.yml b/.github/workflows/react-component-ci.yml index 35b289d3..d4519f32 100644 --- a/.github/workflows/react-component-ci.yml +++ b/.github/workflows/react-component-ci.yml @@ -38,7 +38,7 @@ jobs: - name: install if: steps.node_modules_cache_id.outputs.cache-hit != 'true' - run: npm ci + run: npm ci --legacy-peer-deps lint: runs-on: ubuntu-latest