Skip to content

Commit

Permalink
Use prebuildify-cross (#694)
Browse files Browse the repository at this point in the history
Which has been rewritten, see prebuild/prebuildify-cross#7.

It's a github dependency for now; waiting for npm ownership.
  • Loading branch information
vweevers committed Nov 17, 2019
1 parent d092e6b commit b9513aa
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 29 deletions.
20 changes: 5 additions & 15 deletions .travis.yml
Expand Up @@ -10,7 +10,7 @@ jobs:
env: [TEST=1]
- os: linux
node_js: node
env: [TEST=1, TEST_ELECTRON=1]
env: [TEST=1, TEST_ELECTRON=1, BUILD_GROUP=linux-x64]
addons:
apt:
packages:
Expand All @@ -26,21 +26,11 @@ jobs:
env: [TEST=1]
- os: osx
node_js: node
env: [TEST=1, TEST_ELECTRON=1, BUILD_CMD=prebuild, BUILD_GROUP=darwin-x64]
- name: centos7
os: linux
node_js: node
env: [BUILD_CMD=prebuild-centos7, BUILD_GROUP=linux-x64, NPM_CONFIG_IGNORE_SCRIPTS=1]
if: tag is present
env: [TEST=1, TEST_ELECTRON=1, BUILD_GROUP=darwin-x64]
- name: arm
os: linux
node_js: node
env: [BUILD_CMD=prebuild-arm, BUILD_GROUP=arm, NPM_CONFIG_IGNORE_SCRIPTS=1]
if: tag is present
- name: alpine
os: linux
node_js: node
env: [BUILD_CMD=prebuild-alpine, BUILD_GROUP=alpine, NPM_CONFIG_IGNORE_SCRIPTS=1]
env: [BUILD_GROUP=arm, NPM_CONFIG_IGNORE_SCRIPTS=1]
if: tag is present

script:
Expand All @@ -52,7 +42,7 @@ after_success:

before_deploy:
- export ARCHIVE_NAME="${TRAVIS_TAG:-latest}-$BUILD_GROUP.tar.gz"
- NPM_CONFIG_IGNORE_SCRIPTS= npm run $BUILD_CMD
- NPM_CONFIG_IGNORE_SCRIPTS= npm run prebuild-$BUILD_GROUP
- file prebuilds/*/*
- tar -zcvf "$ARCHIVE_NAME" -C prebuilds .

Expand All @@ -64,7 +54,7 @@ deploy:
skip_cleanup: true
on:
tags: true
condition: "! -z $BUILD_CMD"
condition: "! -z $BUILD_GROUP"

notifications:
email: false
13 changes: 6 additions & 7 deletions package.json
Expand Up @@ -17,13 +17,11 @@
"hallmark": "hallmark --fix",
"dependency-check": "dependency-check --no-dev -i napi-macros . test/*.js",
"prepublishOnly": "npm run dependency-check",
"prebuild-arm": "npm run prebuild-linux-armv7 && npm run prebuild-linux-arm64 && npm run prebuild-android-armv7 && npm run prebuild-android-arm64",
"prebuild-linux-armv7": "IMAGE=linux-armv7 ./scripts/cross-compile --tag-armv",
"prebuild-linux-arm64": "IMAGE=linux-arm64 ./scripts/cross-compile --tag-armv",
"prebuild-android-armv7": "IMAGE=android-armv7 ./scripts/cross-compile --tag-armv",
"prebuild-android-arm64": "IMAGE=android-arm64 ./scripts/cross-compile --tag-armv",
"prebuild-alpine": "IMAGE=alpine ./scripts/cross-compile --tag-libc",
"prebuild-centos7": "IMAGE=centos7-devtoolset7 ./scripts/cross-compile"
"prebuild-arm": "npm run prebuild-linux-arm && npm run prebuild-android-arm",
"prebuild-linux-arm": "prebuildify-cross -i linux-armv7 -i linux-arm64 -t 8.14.0 --napi --strip",
"prebuild-android-arm": "prebuildify-cross -i android-armv7 -i android-arm64 -t 8.14.0 --napi --strip",
"prebuild-linux-x64": "prebuildify-cross -i centos7-devtoolset7 -i alpine -t 8.14.0 --napi --strip",
"prebuild-darwin-x64": "prebuildify -t 8.14.0 --napi --strip"
},
"dependencies": {
"abstract-leveldown": "~6.2.1",
Expand All @@ -48,6 +46,7 @@
"nyc": "^14.0.0",
"prebuildify": "^3.0.0",
"prebuildify-ci": "^1.0.4",
"prebuildify-cross": "github:prebuild/prebuildify-cross#v4.0.0",
"readfiletree": "^1.0.0",
"rimraf": "^3.0.0",
"standard": "^14.0.0",
Expand Down
7 changes: 0 additions & 7 deletions scripts/cross-compile

This file was deleted.

0 comments on commit b9513aa

Please sign in to comment.