Skip to content

Commit

Permalink
Merge pull request #618 from zeromq/spawn-windows
Browse files Browse the repository at this point in the history
fix: fix the Windows prebuilds + fix some of the test failures
  • Loading branch information
aminya authored Jun 14, 2024
2 parents 8fdf3cb + 3701e9d commit b675b0a
Show file tree
Hide file tree
Showing 10 changed files with 155 additions and 46 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ jobs:
docker: node:18-alpine
docker_cmd:
apk add --no-cache pkgconfig curl tar python3 make gcc g++ cmake
musl-dev && npm i -g pnpm && pnpm install && pnpm run prebuild
musl-dev && npm i -g pnpm && pnpm install && pnpm run build.prebuild
node_version: 18
node_arch: x64
ARCH: x64
Expand Down Expand Up @@ -133,7 +133,7 @@ jobs:

- name: Prebuild
if: ${{ !matrix.docker }}
run: pnpm run prebuild
run: pnpm run build.prebuild

- name: Prebuild Docker
if: ${{ matrix.docker }}
Expand Down
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,17 @@ test.js
.cache/
test/typings-compatibility/
/script/*.js
/script/*.mjs
/script/*.d.ts
/script/*.d.mts
/script/*.js.map
/script/*.mjs.map
/script/*/*.js
/script/*/*.mjs
/script/*/*.d.ts
/script/*/*.js.map
tsconfig.tsbuildinfo
tsconfig.esm.tsbuildinfo
/docs-raw
.DS_Store
.idea
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,14 @@
"eslint": "^8",
"eslint-config-atomic": "^1.22.0",
"eslint-plugin-prettier": "^4.2.1",
"execa": "^9.2.0",
"fs-extra": "^10.1.0",
"gh-pages": "^4.0.0",
"minify-all-cli": "^1.0.13",
"mocha": "^10.4.0",
"node-gyp": "^10.1.0",
"npm-run-all2": "^6.2.0",
"prebuildify": "^5.0.1",
"prebuildify": "^6.0.1",
"prettier": "^2.8.8",
"rocha": "^2.5.10",
"semver": "^7.6.2",
Expand Down Expand Up @@ -82,13 +83,12 @@
"install": "(shx test -f ./script/build.js || run-s build.js) && cross-env npm_config_build_from_source=true aminya-node-gyp-build",
"clean": "shx rm -rf ./build ./lib/ ./prebuilds ./script/*.js ./script/*.js.map ./script/*.d.ts ./script/*.tsbuildinfo",
"clean.temp": "shx rm -rf ./tmp && shx mkdir -p ./tmp && shx touch ./tmp/.gitkeep",
"build.library.compat": "shx rm -rf ./lib/ts3.7 && downlevel-dts ./lib ./lib/ts3.7 --to=3.7",
"build.library": "tsc -p ./src/tsconfig.json && run-s build.library.compat",
"build.script": "tsc -p ./script/tsconfig.json",
"build.library": "tsc -p ./src/tsconfig.json",
"build.script": "tsc -p ./script/tsconfig.json && tsc -p ./script/tsconfig.esm.json",
"build.js": "run-p build.script build.library",
"build.doc": "typedoc --options ./typedoc.json && minify-all -s docs-raw -d docs --jsCompressor terser",
"deploy.doc": "run-s build.doc && gh-pages --dist \"./docs\"",
"prebuild": "run-s build.js && node ./script/prebuild.js",
"build.prebuild": "run-s build.js && node ./script/prebuild.mjs",
"build.native": "node-gyp configure --release && node-gyp configure --release -- -f compile_commands_json && node-gyp build --release",
"build.native.debug": "node-gyp configure --debug && node-gyp configure --debug -- -f compile_commands_json && cross-env CMAKE_BUILD_TYPE=Debug node-gyp build --debug",
"build": "run-s build.js build.native",
Expand Down
Loading

0 comments on commit b675b0a

Please sign in to comment.