Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updates #49

Draft
wants to merge 4 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ This project has adopted the [Microsoft Open Source Code of Conduct](https://ope
For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or
contact [[email protected]](mailto:[email protected]) with any additional questions or comments.

* Use pnpm 7.33.6 when udpating the pnpm lock files

## Trademarks

Expand Down
33 changes: 21 additions & 12 deletions build/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,14 +48,14 @@ steps:
cd zeromq.js
git checkout $TREEISH

- bash: |
node ../build/patch.js
git apply --whitespace=fix ../build/zeromq.js.patch
git diff
cp ../build/libzmq.patch .
cp ../build/libzmq-438d5d88.patch .
displayName: Patch zeromq.js
workingDirectory: zeromq.js
# - bash: |
# node ../build/patch.js
# git apply --whitespace=fix ../build/zeromq.js.patch
# git diff
# cp ../build/libzmq.patch .
# cp ../build/libzmq-438d5d88.patch .
# displayName: Patch zeromq.js
# workingDirectory: zeromq.js

- pwsh: |
$includes = @'
Expand Down Expand Up @@ -85,9 +85,8 @@ steps:

- bash: |
export PREBUILD_STRIP_BIN=$STRIP
npm install -g pnpm@latest-8
npm install -g pnpm@latest-9
pnpm install
npm run prebuild
displayName: Build
condition: and(succeeded(), eq('${{ parameters.build }}', 'true'), ne('${{ parameters.ARCH }}', ''))
workingDirectory: zeromq.js
Expand All @@ -97,9 +96,19 @@ steps:
PREBUILD_ARCH: ${{ parameters.ARCH }}

- bash: |
npm install -g pnpm@latest-8
pnpm run build
displayName: Build
condition: and(succeeded(), eq('${{ parameters.build }}', 'true'), ne('${{ parameters.ARCH }}', ''))
workingDirectory: zeromq.js
env:
ARCH: ${{ parameters.ARCH }}
npm_config_arch: ${{ parameters.npm_config_arch }}
PREBUILD_ARCH: ${{ parameters.ARCH }}

- bash: |
npm install -g pnpm@latest-9
pnpm install
npm run prebuild
pnpm run build
displayName: Build (no-arch)
condition: and(succeeded(), eq('${{ parameters.build }}', 'true'), eq('${{ parameters.ARCH }}', ''))
workingDirectory: zeromq.js
Expand Down
4 changes: 2 additions & 2 deletions build/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ extends:
DOCKERCMD: >
addgroup -g 1000 node && adduser -u 1000 -G node -s /bin/sh -D node && HOME=/home/node &&
apk add --no-cache pkgconfig curl tar python3 make gcc g++ cmake musl-dev npm patch &&
npm i -g pnpm@latest-8 && pnpm install && npm run prebuild
npm i -g pnpm@latest-9 && pnpm install && pnpm run build
inputs:
targetType: 'inline'
workingDirectory: zeromq.js
Expand Down Expand Up @@ -257,7 +257,7 @@ extends:
DOCKERCMD: >
addgroup -g 1000 node && adduser -u 1000 -G node -s /bin/sh -D node && HOME=/home/node &&
apk add --no-cache pkgconfig curl tar python3 make gcc g++ cmake musl-dev npm patch &&
npm i -g cross-env pnpm@latest-8 && cross-env ARCH=arm64 npm_config_arch=arm64 pnpm install && cross-env ARCH=arm64 npm_config_arch=arm64 npm run prebuild
npm i -g cross-env pnpm@latest-9 && cross-env ARCH=arm64 npm_config_arch=arm64 pnpm install && cross-env ARCH=arm64 npm_config_arch=arm64 pnpm run build
inputs:
targetType: 'inline'
workingDirectory: zeromq.js
Expand Down
2 changes: 1 addition & 1 deletion config.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"zeromqRepo": "zeromq/zeromq.js",
"zeromqTag": "v6.0.0-beta.19"
"zeromqTag": "v6.3.0"
}
Loading