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.

Sign up for GitHub

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

add {libc} to prebuilt binary package name #38

Merged
merged 3 commits into from
May 3, 2018
Merged

add {libc} to prebuilt binary package name #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0aee752
add {libc} to prebuilt binary package name
Ugzuzg Apr 30, 2018
6732f59
detect libc in release.sh
Ugzuzg Apr 30, 2018
acf863e
add detect-libc to package.json
Ugzuzg Apr 30, 2018
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
5 changes: 2 additions & 3 deletions ci/release.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
# Generate the node-gyp formatted filename from the node environment
FILENAME=$(
node -e "
var p = process, v = p.versions, pkg = require('./package.json');
console.log([pkg.name, 'v$CANVAS_PREBUILT_VERSION', 'node-v' + v.modules, p.platform, p.arch].join('-'));
var p = process, v = p.versions, pkg = require('./package.json'), libc = require('detect-libc').family;
console.log([pkg.name, 'v$CANVAS_PREBUILT_VERSION', 'node-v' + v.modules, p.platform, libc, p.arch].join('-'));
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks. Doesn't detect-libc need to be added to package.json though? Also ignore the failed builds, it's trying to do a release

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You're right. I'll add it.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.

"
).tar.gz;

# Zip up the release
tar -C node-canvas/build -czf $FILENAME Release/

6 changes: 4 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,16 @@
"module_name": "canvas-prebuilt",
"module_path": "canvas/build/Release",
"host": "https://github.com/chearon/node-canvas-prebuilt/releases/download/",
"remote_path": "v{version}"
"remote_path": "v{version}",
"package_name": "{module_name}-v{version}-{node_abi}-{platform}-{libc}-{arch}.tar.gz"
},
"homepage": "https://github.com/chearon/node-canvas-prebuilt",
"repository": "git://github.com/chearon/node-canvas-prebuilt.git",
"main": "./canvas/index.js",
"license": "MIT",
"dependencies": {
"node-pre-gyp": "^0.6.36",
"nan": "^2.4.0"
"nan": "^2.4.0",
"detect-libc": "^1.0.3"
}
}