Skip to content

Commit e498dcb

Browse files
authored
Merge pull request #689 from zeromq/sync-bind [skip ci]
2 parents d473c10 + 44328bc commit e498dcb

File tree

9 files changed

+193
-101
lines changed

9 files changed

+193
-101
lines changed

.github/workflows/CI.yml

Lines changed: 6 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -158,34 +158,18 @@ jobs:
158158
uses: nick-fields/retry@v3
159159
with:
160160
timeout_minutes: 5
161-
max_attempts: 2
161+
max_attempts: 3
162+
shell: bash
162163
command: |
163-
pnpm run test.unit
164-
165-
- name: Clean Tmp
166-
run: rm -rf ./tmp
167-
shell: bash
168-
169-
- name: Test Compatibility
170-
if: ${{ !matrix.dockerfile }}
171-
uses: nick-fields/retry@v3
172-
with:
173-
timeout_minutes: 5
174-
max_attempts: 2
175-
command: |
176-
pnpm run test.unit.compat
177-
continue-on-error: true
178-
179-
- name: Clean Tmp
180-
run: rm -rf ./tmp
181-
shell: bash
164+
pnpm run test.unit || (rm -rf ./tmp && exit 1)
165+
rm -rf ./tmp
182166
183167
- name: Test Electron Windows/MacOS
184168
if: "${{ !contains(matrix.os, 'ubuntu') && !matrix.dockerfile }}"
185169
uses: nick-fields/retry@v3
186170
with:
187171
timeout_minutes: 5
188-
max_attempts: 2
172+
max_attempts: 1
189173
command: |
190174
pnpm run test.electron.main
191175
continue-on-error: true
@@ -195,7 +179,7 @@ jobs:
195179
uses: nick-fields/retry@v3
196180
with:
197181
timeout_minutes: 5
198-
max_attempts: 2
182+
max_attempts: 1
199183
command: |
200184
sudo apt-get install xvfb
201185
xvfb-run --auto-servernum pnpm run test.electron.main

.mocharc.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ const config = {
66
"expose-gc": true,
77
"v8-expose-gc": true,
88
exit: true,
9-
parallel: false,
9+
parallel: true,
1010
timeout: 6000,
1111
retries: 3,
1212
fullTrace: true,

package.json

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
"devDependencies": {
2626
"@types/benchmark": "~2.1.5",
2727
"@types/chai": "^4",
28-
"@types/deasync": "~0.1.5",
2928
"@types/eslint": "~9.6.1",
3029
"@types/fs-extra": "^11.0.4",
3130
"@types/gh-pages": "~6.1.0",
@@ -38,7 +37,6 @@
3837
"benchmark": "^2.1.4",
3938
"chai": "^4",
4039
"cross-env": "^7.0.3",
41-
"deasync": "^0.1.30",
4240
"downlevel-dts": "^0.11.0",
4341
"electron": "^33.2.1",
4442
"electron-mocha": "^13.0.1",
@@ -54,6 +52,7 @@
5452
"prebuildify": "^6.0.1",
5553
"prettier": "^3.4.2",
5654
"proper-lockfile": "^4.1.2",
55+
"rimraf": "^6.0.1",
5756
"semver": "^7.6.3",
5857
"shx": "^0.3.4",
5958
"ts-node": "~10.9.2",
@@ -91,26 +90,25 @@
9190
],
9291
"scripts": {
9392
"install": "node ./script/install.js",
94-
"clean": "shx rm -rf ./build ./prebuilds ./staging && run-p clean.lib clean.temp",
95-
"clean.lib": "shx rm -rf ./lib/",
96-
"clean.release": "shx rm -rf ./build/Release",
97-
"clean.temp": "shx rm -rf ./tmp && shx mkdir -p ./tmp",
93+
"clean": "rimraf ./build ./prebuilds ./staging && run-p clean.lib clean.temp",
94+
"clean.lib": "rimraf ./lib/",
95+
"clean.release": "rimraf ./build/Release",
96+
"clean.temp": "rimraf ./tmp && shx mkdir -p ./tmp",
9897
"build.js": "run-s clean.lib && tsc -p ./src/tsconfig.json && run-s build.downlevel",
9998
"build.downlevel": "downlevel-dts ./lib ./lib/ts3.7",
100-
"build.doc": "typedoc --options ./typedoc.json && minify-all -s docs-unminified -d docs --jsCompressor terser && shx rm -rf docs-unminified",
99+
"build.doc": "typedoc --options ./typedoc.json && minify-all -s docs-unminified -d docs --jsCompressor terser && rimraf docs-unminified",
101100
"deploy.doc": "run-s build.doc && gh-pages --dist \"./docs\"",
102101
"build.native": "cmake-ts nativeonly",
103102
"build.native.debug": "cross-env npm_config_zmq_enable_sanitizer_undefined=true cmake-ts dev-os-only",
104103
"build": "run-p build.js build.native",
105104
"build.debug": "run-s build.js build.native.debug",
106105
"test": "run-s test.unit",
107106
"test.debug": "run-s test.unit.debug",
108-
"test.unit": "run-s clean.temp build && mocha ./test/unit/*-test.ts",
109-
"test.unit.debug": "run-s clean.temp build.debug && mocha ./test/unit/*-test.ts",
110-
"test.unit.compat": "run-s clean.temp build && cross-env INCLUDE_COMPAT_TESTS=true mocha ./test/unit/compat/*-test.ts",
107+
"test.unit": "run-s clean.temp build && cross-env INCLUDE_COMPAT_TESTS=true mocha ./test/unit/*-test.ts ./test/unit/compat/*-test.ts",
108+
"test.unit.debug": "run-s clean.temp build.debug && cross-env INCLUDE_COMPAT_TESTS=true mocha ./test/unit/*-test.ts ./test/unit/compat/*-test.ts",
111109
"test.unit.nogc": "run-s clean.temp build && cross-env SKIP_GC_TESTS=true mocha",
112-
"test.electron.main": "run-s clean.temp build && cross-env SKIP_GC_TESTS=true electron-mocha ./test/unit/*-test.ts",
113-
"test.electron.renderer": "run-s build && electron-mocha --renderer ./test/unit/*-test.ts",
110+
"test.electron.main": "run-s clean.temp build && cross-env INCLUDE_COMPAT_TESTS=true SKIP_GC_TESTS=true electron-mocha ./test/unit/*-test.ts ./test/unit/compat/*-test.ts",
111+
"test.electron.renderer": "run-s build && cross-env INCLUDE_COMPAT_TESTS=true SKIP_GC_TESTS=true electron-mocha --renderer ./test/unit/*-test.ts ./test/unit/compat/*-test.ts",
114112
"test.smoke": "bash ./script/smoke-test.bash",
115113
"format": "run-s format.prettier format.clang-format",
116114
"format.prettier": "prettier -l --cache --cache-location ./.cache/prettier --write .",

pnpm-lock.yaml

Lines changed: 58 additions & 37 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)