From 579b4c626650f06ced4dc45d5d7894bfc1125c38 Mon Sep 17 00:00:00 2001 From: Vincent Weevers Date: Sun, 27 Jan 2019 16:07:54 +0100 Subject: [PATCH 01/25] Add linux-arm64, android-arm and android-arm64 prebuilds --- .travis.yml | 2 +- package.json | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 90551fa0..eaa6d41b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,7 +23,7 @@ jobs: - name: arm os: linux node_js: node - env: [BUILD_CMD=prebuildify-cross-armv7, BUILD_GROUP=arm] + env: [BUILD_CMD=prebuild-arm, BUILD_GROUP=arm] if: tag is present script: diff --git a/package.json b/package.json index cde9adb1..b3c688e3 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,11 @@ "hallmark": "hallmark --fix", "dependency-check": "dependency-check . test/*.js bench/*.js", "prepublishOnly": "npm run dependency-check", - "prebuildify-cross-armv7": "prebuildify-cross --platform=linux --arch=arm --arm-version=7 -- -t 8.14.0 --napi --strip" + "prebuild-arm": "npm run prebuild-linux-arm && npm run prebuild-linux-arm64 && npm run prebuild-android-arm && npm run prebuild-android-arm64", + "prebuild-linux-arm": "prebuildify-cross --platform=linux --arch=arm --arm-version=7 -- -t 8.14.0 --napi --strip", + "prebuild-linux-arm64": "prebuildify-cross --platform=linux --arch=arm64 -- -t 8.14.0 --napi --strip", + "prebuild-android-arm": "prebuildify-cross --platform=android --arch=arm --arm-version=7 -- -t 8.14.0 --napi --strip", + "prebuild-android-arm64": "prebuildify-cross --platform=android --arch=arm64 -- -t 8.14.0 --napi --strip" }, "dependencies": { "abstract-leveldown": "~6.0.0", From 99aaf9250513a4424423c2896cd5f217a8f8fba6 Mon Sep 17 00:00:00 2001 From: Vincent Weevers Date: Sun, 27 Jan 2019 16:25:29 +0100 Subject: [PATCH 02/25] 5.0.0-2-arm --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b3c688e3..dc68b8b7 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "leveldown", - "version": "5.0.0-2", + "version": "5.0.0-2-arm", "description": "A low-level Node.js LevelDB binding", "license": "MIT", "main": "leveldown.js", From 92a2b3b52c949acb0f023b7377a8f3922c38f397 Mon Sep 17 00:00:00 2001 From: Lars-Magnus Skog Date: Sun, 27 Jan 2019 20:33:38 +0100 Subject: [PATCH 03/25] Disable package-lock.json --- .npmrc | 1 + 1 file changed, 1 insertion(+) create mode 100644 .npmrc diff --git a/.npmrc b/.npmrc new file mode 100644 index 00000000..9cf94950 --- /dev/null +++ b/.npmrc @@ -0,0 +1 @@ +package-lock=false \ No newline at end of file From b384ab53327a755f90aeb3fe935c91387b5f6591 Mon Sep 17 00:00:00 2001 From: Lars-Magnus Skog Date: Sun, 27 Jan 2019 20:34:22 +0100 Subject: [PATCH 04/25] Disable android for now --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index dc68b8b7..54ae0790 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ "hallmark": "hallmark --fix", "dependency-check": "dependency-check . test/*.js bench/*.js", "prepublishOnly": "npm run dependency-check", - "prebuild-arm": "npm run prebuild-linux-arm && npm run prebuild-linux-arm64 && npm run prebuild-android-arm && npm run prebuild-android-arm64", + "prebuild-arm": "npm run prebuild-linux-arm && npm run prebuild-linux-arm64", "prebuild-linux-arm": "prebuildify-cross --platform=linux --arch=arm --arm-version=7 -- -t 8.14.0 --napi --strip", "prebuild-linux-arm64": "prebuildify-cross --platform=linux --arch=arm64 -- -t 8.14.0 --napi --strip", "prebuild-android-arm": "prebuildify-cross --platform=android --arch=arm --arm-version=7 -- -t 8.14.0 --napi --strip", From b886ee84f207186c1fc04ad9ec8f348535dab41a Mon Sep 17 00:00:00 2001 From: Lars-Magnus Skog Date: Sun, 27 Jan 2019 20:50:17 +0100 Subject: [PATCH 05/25] Use plain docker for linux and armv7/arm64 --- package.json | 6 +++--- scripts/prebuild-linux-arm64 | 3 +++ scripts/prebuild-linux-armv7 | 3 +++ 3 files changed, 9 insertions(+), 3 deletions(-) create mode 100755 scripts/prebuild-linux-arm64 create mode 100755 scripts/prebuild-linux-armv7 diff --git a/package.json b/package.json index 54ae0790..d6f083ce 100644 --- a/package.json +++ b/package.json @@ -14,9 +14,9 @@ "hallmark": "hallmark --fix", "dependency-check": "dependency-check . test/*.js bench/*.js", "prepublishOnly": "npm run dependency-check", - "prebuild-arm": "npm run prebuild-linux-arm && npm run prebuild-linux-arm64", - "prebuild-linux-arm": "prebuildify-cross --platform=linux --arch=arm --arm-version=7 -- -t 8.14.0 --napi --strip", - "prebuild-linux-arm64": "prebuildify-cross --platform=linux --arch=arm64 -- -t 8.14.0 --napi --strip", + "prebuild-arm": "npm run prebuild-linux-armv7 && npm run prebuild-linux-arm64", + "prebuild-linux-armv7": "./scripts/prebuild-linux-armv7", + "prebuild-linux-arm64": "./scripts/prebuild-linux-arm64", "prebuild-android-arm": "prebuildify-cross --platform=android --arch=arm --arm-version=7 -- -t 8.14.0 --napi --strip", "prebuild-android-arm64": "prebuildify-cross --platform=android --arch=arm64 -- -t 8.14.0 --napi --strip" }, diff --git a/scripts/prebuild-linux-arm64 b/scripts/prebuild-linux-arm64 new file mode 100755 index 00000000..5102235a --- /dev/null +++ b/scripts/prebuild-linux-arm64 @@ -0,0 +1,3 @@ +#!/bin/bash +exec docker run --rm -it -v $(pwd):/app prebuild/linux-arm64 \ + bash -c "npm i --ignore-scripts && npx prebuildify -t 8.14.0 --napi --strip" diff --git a/scripts/prebuild-linux-armv7 b/scripts/prebuild-linux-armv7 new file mode 100755 index 00000000..b8d36874 --- /dev/null +++ b/scripts/prebuild-linux-armv7 @@ -0,0 +1,3 @@ +#!/bin/bash +exec docker run --rm -it -v $(pwd):/app prebuild/linux-armv7 \ + bash -c "npm i --ignore-scripts && npx prebuildify -t 8.14.0 --napi --strip" From 821a9fa332df794b592a275ff1fab87e7f679791 Mon Sep 17 00:00:00 2001 From: Lars-Magnus Skog Date: Sun, 27 Jan 2019 20:55:12 +0100 Subject: [PATCH 06/25] Print out file type after build --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index eaa6d41b..71ba60c7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -35,6 +35,7 @@ after_success: before_deploy: - export ARCHIVE_NAME="${TRAVIS_TAG:-latest}-$BUILD_GROUP.tar.gz" - npm run $BUILD_CMD + - file prebuilds/*/* - tar -zcvf "$ARCHIVE_NAME" -C prebuilds . deploy: From aba704b4f04bf1e86735e5930eeade52ee89d233 Mon Sep 17 00:00:00 2001 From: Lars-Magnus Skog Date: Sun, 27 Jan 2019 22:23:08 +0100 Subject: [PATCH 07/25] 5.0.0-2-docker --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d6f083ce..9d75dcff 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "leveldown", - "version": "5.0.0-2-arm", + "version": "5.0.0-2-docker", "description": "A low-level Node.js LevelDB binding", "license": "MIT", "main": "leveldown.js", From c38859ca624c808b2d6006342dfd225278b30ccc Mon Sep 17 00:00:00 2001 From: Lars-Magnus Skog Date: Sun, 27 Jan 2019 22:40:33 +0100 Subject: [PATCH 08/25] Print out users and groups --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index 71ba60c7..2a7f08f0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,6 +27,10 @@ jobs: if: tag is present script: + - cat /etc/passwd + - cat /etc/group + - groups + - whoami - if [[ ! -z "$TEST_CMD" ]]; then npm run $TEST_CMD; fi after_success: From 53e85751c3c1a9b29437603368c3adacf2f9a068 Mon Sep 17 00:00:00 2001 From: Lars-Magnus Skog Date: Sun, 27 Jan 2019 23:17:36 +0100 Subject: [PATCH 09/25] Print out environment --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 2a7f08f0..dd0d2e9e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,6 +27,7 @@ jobs: if: tag is present script: + - env - cat /etc/passwd - cat /etc/group - groups From 92bb36ea7dd5852f9bd5bd7af06d3bc3c8aa8003 Mon Sep 17 00:00:00 2001 From: Lars-Magnus Skog Date: Sun, 27 Jan 2019 23:23:54 +0100 Subject: [PATCH 10/25] Only do linux-armv7 for now --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 9d75dcff..d5121937 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ "hallmark": "hallmark --fix", "dependency-check": "dependency-check . test/*.js bench/*.js", "prepublishOnly": "npm run dependency-check", - "prebuild-arm": "npm run prebuild-linux-armv7 && npm run prebuild-linux-arm64", + "prebuild-arm": "npm run prebuild-linux-armv7", "prebuild-linux-armv7": "./scripts/prebuild-linux-armv7", "prebuild-linux-arm64": "./scripts/prebuild-linux-arm64", "prebuild-android-arm": "prebuildify-cross --platform=android --arch=arm --arm-version=7 -- -t 8.14.0 --napi --strip", From 12c43df3fae5c23a369e4462f98b46322edb8975 Mon Sep 17 00:00:00 2001 From: Lars-Magnus Skog Date: Sun, 27 Jan 2019 23:24:20 +0100 Subject: [PATCH 11/25] Run docker with user travis on Travis --- scripts/prebuild-linux-armv7 | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/scripts/prebuild-linux-armv7 b/scripts/prebuild-linux-armv7 index b8d36874..6e499f45 100755 --- a/scripts/prebuild-linux-armv7 +++ b/scripts/prebuild-linux-armv7 @@ -1,3 +1,10 @@ #!/bin/bash -exec docker run --rm -it -v $(pwd):/app prebuild/linux-armv7 \ + +set -ex + +DOCKER_USER="node" + +if [[ "$TRAVIS" == "true" ]]; then DOCKER_USER="travis"; fi + +exec docker run -u ${DOCKER_USER} --rm -it -v $(pwd):/app prebuild/linux-armv7 \ bash -c "npm i --ignore-scripts && npx prebuildify -t 8.14.0 --napi --strip" From db6e652ee03c70038455870b956d6fa92eda8ccd Mon Sep 17 00:00:00 2001 From: Lars-Magnus Skog Date: Sun, 27 Jan 2019 23:24:36 +0100 Subject: [PATCH 12/25] 5.0.0-2-docker2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d5121937..35197aff 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "leveldown", - "version": "5.0.0-2-docker", + "version": "5.0.0-2-docker2", "description": "A low-level Node.js LevelDB binding", "license": "MIT", "main": "leveldown.js", From fac40278519c86b0a84883672737b040372b50c9 Mon Sep 17 00:00:00 2001 From: Lars-Magnus Skog Date: Sun, 27 Jan 2019 23:42:42 +0100 Subject: [PATCH 13/25] Revert "Only do linux-armv7 for now" This reverts commit 92bb36ea7dd5852f9bd5bd7af06d3bc3c8aa8003. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 35197aff..8d3694fb 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ "hallmark": "hallmark --fix", "dependency-check": "dependency-check . test/*.js bench/*.js", "prepublishOnly": "npm run dependency-check", - "prebuild-arm": "npm run prebuild-linux-armv7", + "prebuild-arm": "npm run prebuild-linux-armv7 && npm run prebuild-linux-arm64", "prebuild-linux-armv7": "./scripts/prebuild-linux-armv7", "prebuild-linux-arm64": "./scripts/prebuild-linux-arm64", "prebuild-android-arm": "prebuildify-cross --platform=android --arch=arm --arm-version=7 -- -t 8.14.0 --napi --strip", From 14c3c44071ab1b5cb036cbf4cfc7cb7646d7f9ad Mon Sep 17 00:00:00 2001 From: Lars-Magnus Skog Date: Sun, 27 Jan 2019 23:43:09 +0100 Subject: [PATCH 14/25] Clean up --- .travis.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index dd0d2e9e..71ba60c7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,11 +27,6 @@ jobs: if: tag is present script: - - env - - cat /etc/passwd - - cat /etc/group - - groups - - whoami - if [[ ! -z "$TEST_CMD" ]]; then npm run $TEST_CMD; fi after_success: From 43c07af506ac481562195517193da8ca4c84a67e Mon Sep 17 00:00:00 2001 From: Lars-Magnus Skog Date: Sun, 27 Jan 2019 23:44:38 +0100 Subject: [PATCH 15/25] Update arm64 script --- scripts/prebuild-linux-arm64 | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/scripts/prebuild-linux-arm64 b/scripts/prebuild-linux-arm64 index 5102235a..aeab4c9d 100755 --- a/scripts/prebuild-linux-arm64 +++ b/scripts/prebuild-linux-arm64 @@ -1,3 +1,10 @@ #!/bin/bash -exec docker run --rm -it -v $(pwd):/app prebuild/linux-arm64 \ + +set -ex + +DOCKER_USER="node" + +if [[ "$TRAVIS" == "true" ]]; then DOCKER_USER="travis"; fi + +exec docker run -u ${DOCKER_USER} --rm -it -v $(pwd):/app prebuild/linux-arm64 \ bash -c "npm i --ignore-scripts && npx prebuildify -t 8.14.0 --napi --strip" From 9c768030b910995736ec542628ea1eb7bd42f768 Mon Sep 17 00:00:00 2001 From: Lars-Magnus Skog Date: Sun, 27 Jan 2019 23:44:54 +0100 Subject: [PATCH 16/25] 5.0.0-2-docker3 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8d3694fb..d8437acf 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "leveldown", - "version": "5.0.0-2-docker2", + "version": "5.0.0-2-docker3", "description": "A low-level Node.js LevelDB binding", "license": "MIT", "main": "leveldown.js", From e057ee68cf22f721d969f470ba5bb36eb0261952 Mon Sep 17 00:00:00 2001 From: Lars-Magnus Skog Date: Mon, 28 Jan 2019 00:33:17 +0100 Subject: [PATCH 17/25] Add back android armv7 --- package.json | 4 ++-- scripts/prebuild-android-armv7 | 10 ++++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) create mode 100755 scripts/prebuild-android-armv7 diff --git a/package.json b/package.json index d8437acf..0293e7ed 100644 --- a/package.json +++ b/package.json @@ -14,10 +14,10 @@ "hallmark": "hallmark --fix", "dependency-check": "dependency-check . test/*.js bench/*.js", "prepublishOnly": "npm run dependency-check", - "prebuild-arm": "npm run prebuild-linux-armv7 && npm run prebuild-linux-arm64", + "prebuild-arm": "npm run prebuild-linux-armv7 && npm run prebuild-linux-arm64 && npm run prebuild-android-armv7", "prebuild-linux-armv7": "./scripts/prebuild-linux-armv7", "prebuild-linux-arm64": "./scripts/prebuild-linux-arm64", - "prebuild-android-arm": "prebuildify-cross --platform=android --arch=arm --arm-version=7 -- -t 8.14.0 --napi --strip", + "prebuild-android-armv7": "./scripts/prebuild-android-armv7", "prebuild-android-arm64": "prebuildify-cross --platform=android --arch=arm64 -- -t 8.14.0 --napi --strip" }, "dependencies": { diff --git a/scripts/prebuild-android-armv7 b/scripts/prebuild-android-armv7 new file mode 100755 index 00000000..38ac454c --- /dev/null +++ b/scripts/prebuild-android-armv7 @@ -0,0 +1,10 @@ +#!/bin/bash + +set -ex + +DOCKER_USER="node" + +if [[ "$TRAVIS" == "true" ]]; then DOCKER_USER="travis"; fi + +exec docker run -u ${DOCKER_USER} --rm -it -v $(pwd):/app prebuild/android-armv7 \ + bash -c "npm i --ignore-scripts && npx prebuildify -t 8.14.0 --napi --strip" From 6ea1cba2338405cffe06413de096ad8d0d323e5a Mon Sep 17 00:00:00 2001 From: Lars-Magnus Skog Date: Mon, 28 Jan 2019 00:33:27 +0100 Subject: [PATCH 18/25] 5.0.0-2-docker4 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0293e7ed..7764c1d6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "leveldown", - "version": "5.0.0-2-docker3", + "version": "5.0.0-2-docker4", "description": "A low-level Node.js LevelDB binding", "license": "MIT", "main": "leveldown.js", From 08e0d599330b160ac6f1400ff045929e5117f8fa Mon Sep 17 00:00:00 2001 From: Lars-Magnus Skog Date: Mon, 28 Jan 2019 00:48:22 +0100 Subject: [PATCH 19/25] Add back android arm64 --- package.json | 2 +- scripts/prebuild-android-arm64 | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100755 scripts/prebuild-android-arm64 diff --git a/package.json b/package.json index 7764c1d6..5c7226cd 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ "prebuild-linux-armv7": "./scripts/prebuild-linux-armv7", "prebuild-linux-arm64": "./scripts/prebuild-linux-arm64", "prebuild-android-armv7": "./scripts/prebuild-android-armv7", - "prebuild-android-arm64": "prebuildify-cross --platform=android --arch=arm64 -- -t 8.14.0 --napi --strip" + "prebuild-android-arm64": "./scripts/prebuild-android-arm64" }, "dependencies": { "abstract-leveldown": "~6.0.0", diff --git a/scripts/prebuild-android-arm64 b/scripts/prebuild-android-arm64 new file mode 100755 index 00000000..5543961e --- /dev/null +++ b/scripts/prebuild-android-arm64 @@ -0,0 +1,10 @@ +#!/bin/bash + +set -ex + +DOCKER_USER="node" + +if [[ "$TRAVIS" == "true" ]]; then DOCKER_USER="travis"; fi + +exec docker run -u ${DOCKER_USER} --rm -it -v $(pwd):/app prebuild/android-arm64 \ + bash -c "npm i --ignore-scripts && npx prebuildify -t 8.14.0 --napi --strip" From 1435e49dd9b2136ddc0e890951c3209563ff797a Mon Sep 17 00:00:00 2001 From: Lars-Magnus Skog Date: Mon, 28 Jan 2019 00:48:32 +0100 Subject: [PATCH 20/25] 5.0.0-2-docker5 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 5c7226cd..851be3c7 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "leveldown", - "version": "5.0.0-2-docker4", + "version": "5.0.0-2-docker5", "description": "A low-level Node.js LevelDB binding", "license": "MIT", "main": "leveldown.js", From b51374233bef65588d8c72c9005eac39a083a780 Mon Sep 17 00:00:00 2001 From: Lars-Magnus Skog Date: Mon, 28 Jan 2019 01:00:53 +0100 Subject: [PATCH 21/25] Actually run prebuild-android-arm64 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 851be3c7..6b97bb79 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ "hallmark": "hallmark --fix", "dependency-check": "dependency-check . test/*.js bench/*.js", "prepublishOnly": "npm run dependency-check", - "prebuild-arm": "npm run prebuild-linux-armv7 && npm run prebuild-linux-arm64 && npm run prebuild-android-armv7", + "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": "./scripts/prebuild-linux-armv7", "prebuild-linux-arm64": "./scripts/prebuild-linux-arm64", "prebuild-android-armv7": "./scripts/prebuild-android-armv7", From 7112fe1f1abb6e2da37f7a105b0c7cdfb21f1b3d Mon Sep 17 00:00:00 2001 From: Lars-Magnus Skog Date: Mon, 28 Jan 2019 01:01:03 +0100 Subject: [PATCH 22/25] 5.0.0-2-docker6 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6b97bb79..f651cfeb 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "leveldown", - "version": "5.0.0-2-docker5", + "version": "5.0.0-2-docker6", "description": "A low-level Node.js LevelDB binding", "license": "MIT", "main": "leveldown.js", From 51c4cfb353da5af3d96554e175c7b89a2fe225bf Mon Sep 17 00:00:00 2001 From: Lars-Magnus Skog Date: Mon, 28 Jan 2019 01:14:28 +0100 Subject: [PATCH 23/25] Refactor into cross-compile script + remove prebuildify-cross dependency --- package.json | 9 ++++----- scripts/{prebuild-linux-arm64 => cross-compile} | 5 +---- scripts/prebuild-android-arm64 | 10 ---------- scripts/prebuild-android-armv7 | 10 ---------- scripts/prebuild-linux-armv7 | 10 ---------- 5 files changed, 5 insertions(+), 39 deletions(-) rename scripts/{prebuild-linux-arm64 => cross-compile} (89%) delete mode 100755 scripts/prebuild-android-arm64 delete mode 100755 scripts/prebuild-android-armv7 delete mode 100755 scripts/prebuild-linux-armv7 diff --git a/package.json b/package.json index f651cfeb..f49bd58e 100644 --- a/package.json +++ b/package.json @@ -15,10 +15,10 @@ "dependency-check": "dependency-check . test/*.js bench/*.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": "./scripts/prebuild-linux-armv7", - "prebuild-linux-arm64": "./scripts/prebuild-linux-arm64", - "prebuild-android-armv7": "./scripts/prebuild-android-armv7", - "prebuild-android-arm64": "./scripts/prebuild-android-arm64" + "prebuild-linux-armv7": "IMAGE=linux-armv7 ./scripts/cross-compile", + "prebuild-linux-arm64": "IMAGE=linux-arm64 ./scripts/cross-compile", + "prebuild-android-armv7": "IMAGE=android-armv7 ./scripts/cross-compile", + "prebuild-android-arm64": "IMAGE=android-arm64 ./scripts/cross-compile" }, "dependencies": { "abstract-leveldown": "~6.0.0", @@ -42,7 +42,6 @@ "optimist": "~0.6.1", "prebuildify": "prebuild/prebuildify#override-platform", "prebuildify-ci": "^1.0.4", - "prebuildify-cross": "ralphtheninja/prebuildify-cross#TARGET_PLATFORM", "readfiletree": "~0.0.1", "rimraf": "^2.6.1", "slump": "^3.0.0", diff --git a/scripts/prebuild-linux-arm64 b/scripts/cross-compile similarity index 89% rename from scripts/prebuild-linux-arm64 rename to scripts/cross-compile index aeab4c9d..af4ab5bd 100755 --- a/scripts/prebuild-linux-arm64 +++ b/scripts/cross-compile @@ -1,10 +1,7 @@ #!/bin/bash -set -ex - DOCKER_USER="node" - if [[ "$TRAVIS" == "true" ]]; then DOCKER_USER="travis"; fi -exec docker run -u ${DOCKER_USER} --rm -it -v $(pwd):/app prebuild/linux-arm64 \ +exec docker run -u ${DOCKER_USER} --rm -it -v $(pwd):/app prebuild/${IMAGE} \ bash -c "npm i --ignore-scripts && npx prebuildify -t 8.14.0 --napi --strip" diff --git a/scripts/prebuild-android-arm64 b/scripts/prebuild-android-arm64 deleted file mode 100755 index 5543961e..00000000 --- a/scripts/prebuild-android-arm64 +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -set -ex - -DOCKER_USER="node" - -if [[ "$TRAVIS" == "true" ]]; then DOCKER_USER="travis"; fi - -exec docker run -u ${DOCKER_USER} --rm -it -v $(pwd):/app prebuild/android-arm64 \ - bash -c "npm i --ignore-scripts && npx prebuildify -t 8.14.0 --napi --strip" diff --git a/scripts/prebuild-android-armv7 b/scripts/prebuild-android-armv7 deleted file mode 100755 index 38ac454c..00000000 --- a/scripts/prebuild-android-armv7 +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -set -ex - -DOCKER_USER="node" - -if [[ "$TRAVIS" == "true" ]]; then DOCKER_USER="travis"; fi - -exec docker run -u ${DOCKER_USER} --rm -it -v $(pwd):/app prebuild/android-armv7 \ - bash -c "npm i --ignore-scripts && npx prebuildify -t 8.14.0 --napi --strip" diff --git a/scripts/prebuild-linux-armv7 b/scripts/prebuild-linux-armv7 deleted file mode 100755 index 6e499f45..00000000 --- a/scripts/prebuild-linux-armv7 +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -set -ex - -DOCKER_USER="node" - -if [[ "$TRAVIS" == "true" ]]; then DOCKER_USER="travis"; fi - -exec docker run -u ${DOCKER_USER} --rm -it -v $(pwd):/app prebuild/linux-armv7 \ - bash -c "npm i --ignore-scripts && npx prebuildify -t 8.14.0 --napi --strip" From d48e9dd63c5e5b72497bc392424a9c2e24689d85 Mon Sep 17 00:00:00 2001 From: Lars-Magnus Skog Date: Mon, 28 Jan 2019 01:22:23 +0100 Subject: [PATCH 24/25] Revert temporary version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f49bd58e..e3ece591 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "leveldown", - "version": "5.0.0-2-docker6", + "version": "5.0.0-2", "description": "A low-level Node.js LevelDB binding", "license": "MIT", "main": "leveldown.js", From dfd15d69814037da735358d88a629497f5ed3517 Mon Sep 17 00:00:00 2001 From: Lars-Magnus Skog Date: Fri, 1 Feb 2019 13:41:58 +0100 Subject: [PATCH 25/25] Remove -it --- scripts/cross-compile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/cross-compile b/scripts/cross-compile index af4ab5bd..378d9e1b 100755 --- a/scripts/cross-compile +++ b/scripts/cross-compile @@ -3,5 +3,5 @@ DOCKER_USER="node" if [[ "$TRAVIS" == "true" ]]; then DOCKER_USER="travis"; fi -exec docker run -u ${DOCKER_USER} --rm -it -v $(pwd):/app prebuild/${IMAGE} \ +exec docker run -u ${DOCKER_USER} --rm -v $(pwd):/app prebuild/${IMAGE} \ bash -c "npm i --ignore-scripts && npx prebuildify -t 8.14.0 --napi --strip"