Merge pull request #689 from zeromq/sync-bind [skip ci]

zeromq · Dec 30, 2024 · e498dcb · e498dcb
2 parents d473c10 + 44328bc
commit e498dcb
Show file tree

Hide file tree

Showing 9 changed files with 193 additions and 101 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -158,34 +158,18 @@ jobs:
         uses: nick-fields/retry@v3
         with:
           timeout_minutes: 5
-          max_attempts: 2
+          max_attempts: 3
+          shell: bash
           command: |
-            pnpm run test.unit
-
-      - name: Clean Tmp
-        run: rm -rf ./tmp
-        shell: bash
-
-      - name: Test Compatibility
-        if: ${{ !matrix.dockerfile }}
-        uses: nick-fields/retry@v3
-        with:
-          timeout_minutes: 5
-          max_attempts: 2
-          command: |
-            pnpm run test.unit.compat
-        continue-on-error: true
-
-      - name: Clean Tmp
-        run: rm -rf ./tmp
-        shell: bash
+            pnpm run test.unit || (rm -rf ./tmp && exit 1)
+            rm -rf ./tmp
 
       - name: Test Electron Windows/MacOS
         if: "${{ !contains(matrix.os, 'ubuntu') && !matrix.dockerfile }}"
         uses: nick-fields/retry@v3
         with:
           timeout_minutes: 5
-          max_attempts: 2
+          max_attempts: 1
           command: |
             pnpm run test.electron.main
         continue-on-error: true
@@ -195,7 +179,7 @@ jobs:
         uses: nick-fields/retry@v3
         with:
           timeout_minutes: 5
-          max_attempts: 2
+          max_attempts: 1
           command: |
             sudo apt-get install xvfb
             xvfb-run --auto-servernum pnpm run test.electron.main

diff --git a/.mocharc.js b/.mocharc.js
@@ -6,7 +6,7 @@ const config = {
   "expose-gc": true,
   "v8-expose-gc": true,
   exit: true,
-  parallel: false,
+  parallel: true,
   timeout: 6000,
   retries: 3,
   fullTrace: true,

diff --git a/package.json b/package.json
@@ -25,7 +25,6 @@
   "devDependencies": {
     "@types/benchmark": "~2.1.5",
     "@types/chai": "^4",
-    "@types/deasync": "~0.1.5",
     "@types/eslint": "~9.6.1",
     "@types/fs-extra": "^11.0.4",
     "@types/gh-pages": "~6.1.0",
@@ -38,7 +37,6 @@
     "benchmark": "^2.1.4",
     "chai": "^4",
     "cross-env": "^7.0.3",
-    "deasync": "^0.1.30",
     "downlevel-dts": "^0.11.0",
     "electron": "^33.2.1",
     "electron-mocha": "^13.0.1",
@@ -54,6 +52,7 @@
     "prebuildify": "^6.0.1",
     "prettier": "^3.4.2",
     "proper-lockfile": "^4.1.2",
+    "rimraf": "^6.0.1",
     "semver": "^7.6.3",
     "shx": "^0.3.4",
     "ts-node": "~10.9.2",
@@ -91,26 +90,25 @@
   ],
   "scripts": {
     "install": "node ./script/install.js",
-    "clean": "shx rm -rf ./build ./prebuilds ./staging && run-p clean.lib clean.temp",
-    "clean.lib": "shx rm -rf ./lib/",
-    "clean.release": "shx rm -rf ./build/Release",
-    "clean.temp": "shx rm -rf ./tmp && shx mkdir -p ./tmp",
+    "clean": "rimraf ./build ./prebuilds ./staging && run-p clean.lib clean.temp",
+    "clean.lib": "rimraf ./lib/",
+    "clean.release": "rimraf ./build/Release",
+    "clean.temp": "rimraf ./tmp && shx mkdir -p ./tmp",
     "build.js": "run-s clean.lib && tsc -p ./src/tsconfig.json && run-s build.downlevel",
     "build.downlevel": "downlevel-dts ./lib ./lib/ts3.7",
-    "build.doc": "typedoc --options ./typedoc.json && minify-all -s docs-unminified -d docs --jsCompressor terser && shx rm -rf docs-unminified",
+    "build.doc": "typedoc --options ./typedoc.json && minify-all -s docs-unminified -d docs --jsCompressor terser && rimraf docs-unminified",
     "deploy.doc": "run-s build.doc && gh-pages --dist \"./docs\"",
     "build.native": "cmake-ts nativeonly",
     "build.native.debug": "cross-env npm_config_zmq_enable_sanitizer_undefined=true cmake-ts dev-os-only",
     "build": "run-p build.js build.native",
     "build.debug": "run-s build.js build.native.debug",
     "test": "run-s test.unit",
     "test.debug": "run-s test.unit.debug",
-    "test.unit": "run-s clean.temp build && mocha ./test/unit/*-test.ts",
-    "test.unit.debug": "run-s clean.temp build.debug && mocha ./test/unit/*-test.ts",
-    "test.unit.compat": "run-s clean.temp build && cross-env INCLUDE_COMPAT_TESTS=true mocha ./test/unit/compat/*-test.ts",
+    "test.unit": "run-s clean.temp build && cross-env INCLUDE_COMPAT_TESTS=true mocha ./test/unit/*-test.ts ./test/unit/compat/*-test.ts",
+    "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",
     "test.unit.nogc": "run-s clean.temp build && cross-env SKIP_GC_TESTS=true mocha",
-    "test.electron.main": "run-s clean.temp build && cross-env SKIP_GC_TESTS=true electron-mocha ./test/unit/*-test.ts",
-    "test.electron.renderer": "run-s build && electron-mocha --renderer ./test/unit/*-test.ts",
+    "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",
+    "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",
     "test.smoke": "bash ./script/smoke-test.bash",
     "format": "run-s format.prettier format.clang-format",
     "format.prettier": "prettier -l --cache --cache-location ./.cache/prettier --write .",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml