Skip to content

Commit b817aac

Browse files
committed
ci: update the cache keys
1 parent e498dcb commit b817aac

File tree

3 files changed

+8
-12
lines changed

3 files changed

+8
-12
lines changed

.github/workflows/CI.yml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,6 @@ jobs:
4747
cpp_arch: x64
4848

4949
env:
50-
npm_config_zmq_draft: false
51-
npm_config_zmq_shared: false
5250
npm_config_arch: ${{ matrix.node_arch }}
5351
npm_config_target_arch: ${{ matrix.node_arch }}
5452
setup_node_arch: ${{ matrix.node_arch }}
@@ -63,9 +61,9 @@ jobs:
6361
~/vcpkg
6462
key:
6563
# prettier-ignore
66-
"cache-OS:${{ matrix.os }}-arch:${{ matrix.node_arch}}-ZMQ_DRAFT:${{env.npm_config_zmq_draft }}-${{hashFiles('./package.json') }}"
64+
"cache-OS:${{ matrix.os }}-arch:${{ matrix.node_arch}}-${{hashFiles('./pnpm-lock.yaml', './vcpkg.json', './CMakeLists.txt') }}"
6765
restore-keys: |
68-
"cache-OS:${{ matrix.os }}-arch:${{ matrix.node_arch }}-ZMQ_DRAFT:${{ env.npm_config_zmq_draft }}-"
66+
"cache-OS:${{ matrix.os }}-arch:${{ matrix.node_arch }}-"
6967
7068
- name: Env map
7169
run: |
@@ -161,8 +159,8 @@ jobs:
161159
max_attempts: 3
162160
shell: bash
163161
command: |
164-
pnpm run test.unit || (rm -rf ./tmp && exit 1)
165-
rm -rf ./tmp
162+
pnpm run test.unit || (rm -rf ./tmp && mkdir -p ./tmp && exit 1)
163+
rm -rf ./tmp && mkdir -p ./tmp
166164
167165
- name: Test Electron Windows/MacOS
168166
if: "${{ !contains(matrix.os, 'ubuntu') && !matrix.dockerfile }}"

.github/workflows/docs.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,26 +20,25 @@ jobs:
2020
cpp_arch:
2121
- x64
2222
env:
23-
npm_config_zmq_draft: false
24-
npm_config_zmq_shared: false
2523
npm_config_arch: ${{ matrix.node_arch }}
2624
npm_config_target_arch: ${{ matrix.node_arch }}
2725
setup_node_arch: ${{ matrix.node_arch }}
2826

2927
steps:
3028
- uses: actions/checkout@v4
3129

30+
3231
- name: Cache
3332
uses: actions/cache@v4
3433
with:
3534
path: |
3635
./node_modules/
37-
./build/
36+
~/vcpkg
3837
key:
3938
# prettier-ignore
40-
"cache-OS:${{ matrix.os }}-arch:${{ matrix.node_arch}}-ZMQ_DRAFT:${{env.npm_config_zmq_draft }}-Node:${{ matrix.node_version}}-${{hashFiles('./package.json') }}-docs"
39+
"docs-cache-OS:${{ matrix.os }}-arch:${{ matrix.node_arch}}-${{hashFiles('./pnpm-lock.yaml', './vcpkg.json', './CMakeLists.txt') }}"
4140
restore-keys: |
42-
"cache-OS:${{ matrix.os }}-arch:${{ matrix.node_arch }}-ZMQ_DRAFT:${{ env.npm_config_zmq_draft }}-Node:${{ matrix.node_version }}-"
41+
"docs-cache-OS:${{ matrix.os }}-arch:${{ matrix.node_arch }}-"
4342
4443
- name: Env map
4544
run: |

package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,6 @@
9292
"install": "node ./script/install.js",
9393
"clean": "rimraf ./build ./prebuilds ./staging && run-p clean.lib clean.temp",
9494
"clean.lib": "rimraf ./lib/",
95-
"clean.release": "rimraf ./build/Release",
9695
"clean.temp": "rimraf ./tmp && shx mkdir -p ./tmp",
9796
"build.js": "run-s clean.lib && tsc -p ./src/tsconfig.json && run-s build.downlevel",
9897
"build.downlevel": "downlevel-dts ./lib ./lib/ts3.7",

0 commit comments

Comments
 (0)