Merge pull request #424 from napi-rs/bsd-aarch64-musl

build: add FreeBSD and aarch64-linux-unknown-musl targets

Author: Brooooooklyn

.cargo/config.toml

@@ -3,3 +3,7 @@ linker = "aarch64-linux-gnu-gcc"
 
 [target.armv7-unknown-linux-gnueabihf]
 linker = "arm-linux-gnueabihf-gcc"
+
+[target.aarch64-unknown-linux-musl]
+linker = "aarch64-linux-gnu-gcc"
+rustflags = ["-C", "target-feature=-crt-static", "-C", "link-arg=-lgcc"]

.github/workflows/ci.yaml

@@ -158,7 +158,7 @@ jobs:
 
   build-musl:
     if: "!contains(github.event.head_commit.message, 'skip ci')"
-    name: stable - linux-musl - node@10
+    name: stable - linux-musl - node@lts
     runs-on: ubuntu-latest
 
     steps:
@@ -168,7 +168,7 @@ jobs:
         run: |
           docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD $DOCKER_REGISTRY_URL
         env:
-          DOCKER_REGISTRY_URL: docker.pkg.github.com
+          DOCKER_REGISTRY_URL: ghcr.io
           DOCKER_USERNAME: ${{ github.actor }}
           DOCKER_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
 
@@ -181,18 +181,18 @@ jobs:
         uses: actions/cache@v1
         with:
           path: ~/.cargo/registry
-          key: stable-node-alpine-@10-cargo-registry-trimmed-${{ hashFiles('**/Cargo.lock') }}
+          key: stable-node-alpine-@lts-cargo-registry-trimmed-${{ hashFiles('**/Cargo.lock') }}
 
       - name: Cache cargo index
         uses: actions/cache@v1
         with:
           path: ~/.cargo/git
-          key: stable-node-alpine-@10-cargo-index-trimmed-${{ hashFiles('**/Cargo.lock') }}
+          key: stable-node-alpine-@lts-cargo-index-trimmed-${{ hashFiles('**/Cargo.lock') }}
 
       - name: Pull docker image
         run: |
-          docker pull docker.pkg.github.com/napi-rs/napi-rs/nodejs-rust:10-alpine
-          docker tag docker.pkg.github.com/napi-rs/napi-rs/nodejs-rust:10-alpine builder
+          docker pull ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-alpine
+          docker tag ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-alpine builder
 
       - name: 'Install dependencies'
         run: yarn install --frozen-lockfile --registry https://registry.npmjs.org --network-timeout 300000
@@ -271,6 +271,82 @@ jobs:
           name: bindings-linux-aarch64
           path: packages/*/*.node
 
+  build-linux-aarch64-musl:
+    name: stable - aarch64-unknown-linux-musl - node@14
+    runs-on: ubuntu-latest
+
+    steps:
+      - run: docker run --rm --privileged multiarch/qemu-user-static:register --reset
+
+      - uses: actions/checkout@v2
+
+      - name: Setup node
+        uses: actions/setup-node@v2-beta
+        with:
+          node-version: 14
+          check-latest: true
+
+      - name: Install
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+          profile: minimal
+          override: true
+
+      - name: Install aarch64 toolchain
+        run: rustup target add aarch64-unknown-linux-musl
+
+      - name: Generate Cargo.lock
+        uses: actions-rs/cargo@v1
+        with:
+          command: generate-lockfile
+
+      - name: Cache cargo registry
+        uses: actions/cache@v1
+        with:
+          path: ~/.cargo/registry
+          key: stable-linux-aarch64-musl-node@14-cargo-registry-trimmed-${{ hashFiles('**/Cargo.lock') }}
+
+      - name: Cache cargo index
+        uses: actions/cache@v1
+        with:
+          path: ~/.cargo/git
+          key: stable-linux-aarch64-musl-node@14-cargo-index-trimmed-${{ hashFiles('**/Cargo.lock') }}
+
+      - name: Cache NPM dependencies
+        uses: actions/cache@v1
+        with:
+          path: node_modules
+          key: npm-cache-linux-aarch64-musl-node@14-${{ hashFiles('yarn.lock') }}
+
+      - name: Install cross compile toolchain
+        run: |
+          sudo apt-get update
+          sudo apt-get install gcc-aarch64-linux-gnu -y
+
+      - name: Install dependencies
+        run: yarn install --frozen-lockfile --registry https://registry.npmjs.org --network-timeout 300000
+
+      - name: Cross build aarch64
+        run: yarn build -- -- --target aarch64-unknown-linux-musl
+
+      - name: Run tests
+        uses: docker://multiarch/alpine:aarch64-latest-stable
+        with:
+          args: >
+            sh -c "sed -i -e 's/v[[:digit:]]\..*\//edge\//g' /etc/apk/repositories && \
+              apk add nodejs yarn && \
+              yarn install --frozen-lockfile --ignore-scripts --registry https://registry.npmjs.org --network-timeout 300000 && \
+              yarn build:ts && \
+              node ./scripts/simple-tests.js
+            "
+
+      - name: Upload artifact
+        uses: actions/upload-artifact@v2
+        with:
+          name: bindings-linux-aarch64-musl
+          path: packages/*/*.node
+
   build-linux-arm7:
     name: stable - arm7-unknown-linux-gnu - node@14
     runs-on: ubuntu-latest
@@ -444,6 +520,52 @@ jobs:
           name: bindings-android-aarch64
           path: packages/*/*.node
 
+  build-freebsd:
+    runs-on: macos-latest
+    name: Build FreeBSD
+    steps:
+      - uses: actions/checkout@v2
+      - name: Build
+        id: build
+        uses: vmactions/[email protected]
+        env:
+          DEBUG: 'napi:*'
+          RUSTUP_HOME: /usr/local/rustup
+          CARGO_HOME: /usr/local/cargo
+          RUSTUP_IO_THREADS: 1
+        with:
+          envs: 'DEBUG RUSTUP_HOME CARGO_HOME RUSTUP_IO_THREADS'
+          usesh: true
+          mem: 3000
+          prepare: |
+            pkg install -y curl node yarn npm python2
+            curl https://sh.rustup.rs -sSf --output rustup.sh
+            sh rustup.sh -y --profile minimal --default-toolchain stable
+            export PATH="/usr/local/cargo/bin:$PATH"
+            echo "~~~~ rustc --version ~~~~"
+            rustc --version
+            echo "~~~~ node -v ~~~~"
+            node -v
+            echo "~~~~ yarn --version ~~~~"
+            yarn --version
+          run: |
+            export PATH="/usr/local/cargo/bin:$PATH"
+            pwd
+            ls -lah
+            whoami
+            env
+            freebsd-version
+            yarn install --frozen-lockfile --registry https://registry.npmjs.org --network-timeout 300000
+            yarn build:ts
+            yarn build
+            yarn test
+
+      - name: Upload artifact
+        uses: actions/upload-artifact@v2
+        with:
+          name: bindings-freebsd-amd64
+          path: packages/*/*.node
+
   test-binding:
     name: Test bindings on ${{ matrix.os }} - node@${{ matrix.node }}
     needs:
@@ -452,7 +574,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-18.04, macos-latest, windows-latest]
-        node: ['10', '12', '14', '15']
+        node: ['12', '14', '16']
     runs-on: ${{ matrix.os }}
 
     steps:
@@ -495,7 +617,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node: ['10', '12', '14', '15']
+        node: ['12', '14', '16']
     runs-on: ubuntu-latest
 
     steps:
@@ -532,7 +654,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node: ['10', '12', '14', '15']
+        node: ['12', '14', '16']
 
     steps:
       - run: docker run --rm --privileged multiarch/qemu-user-static:register --reset
@@ -592,6 +714,8 @@ jobs:
       - build-linux-arm7
       - build-apple-silicon
       - build-windows-i686
+      - build-linux-aarch64-musl
+      - build-freebsd
     steps:
       - uses: actions/checkout@v2
 

package.json

@@ -11,28 +11,28 @@
     "bench": "lerna run bench --concurrency 1 --stream --no-prefix",
     "build": "lerna run build --concurrency 1 --stream --no-prefix",
     "build:ts": "tsc -b tsconfig.project.json -verbose",
-    "lint": "eslint . -c ./.eslintrc.yml 'packages/**/*.{ts,js}'",
+    "lint": "eslint . -c ./.eslintrc.yml \"packages/**/*.{ts,js}\"",
     "test": "ava",
     "format": "run-p format:md format:json format:yaml format:source",
-    "format:md": "prettier --parser markdown --write './**/*.md'",
-    "format:json": "prettier --parser json --write './**/*.json'",
-    "format:source": "prettier --config ./package.json --write './**/*.{js,ts}'",
-    "format:yaml": "prettier --parser yaml --write './**/*.{yml,yaml}'",
+    "format:md": "prettier --parser markdown --write \"./**/*.md\"",
+    "format:json": "prettier --parser json --write \"./**/*.json\"",
+    "format:source": "prettier --config ./package.json --write \"./**/*.{js,ts}\"",
+    "format:yaml": "prettier --parser yaml --write \"./**/*.{yml,yaml}\"",
     "typecheck": "tsc -b tsconfig.project.json -verbose",
     "postinstall": "husky install"
   },
   "devDependencies": {
     "@napi-rs/cli": "^1.0.4",
     "@swc-node/register": "^1.3.1",
-    "@typescript-eslint/eslint-plugin": "^4.24.0",
-    "@typescript-eslint/parser": "^4.24.0",
+    "@typescript-eslint/eslint-plugin": "^4.25.0",
+    "@typescript-eslint/parser": "^4.25.0",
     "ava": "^3.15.0",
     "benchmark": "^2.1.4",
     "codecov": "^3.8.2",
     "cross-env": "^7.0.3",
     "eslint": "^7.27.0",
     "eslint-config-prettier": "^8.3.0",
-    "eslint-plugin-import": "^2.23.3",
+    "eslint-plugin-import": "^2.23.4",
     "eslint-plugin-prettier": "^3.4.0",
     "eslint-plugin-sonarjs": "^0.7.0",
     "husky": "^6.0.0",
@@ -41,7 +41,7 @@
     "npm-run-all": "^4.1.5",
     "nyc": "^15.1.0",
     "prettier": "^2.3.0",
-    "typescript": "^4.2.4"
+    "typescript": "^4.3.2"
   },
   "ava": {
     "extensions": ["ts"],

packages/bcrypt/Cargo.toml

@@ -16,7 +16,7 @@ phf = {version = "0.8", features = ["macros"]}
 radix64 = "0.6"
 rand = "0.8"
 
-[target.'cfg(all(unix, not(target_env = "musl"), not(target_arch = "aarch64")))'.dependencies]
+[target.'cfg(all(unix, not(target_env = "musl"), not(target_os = "freebsd"), not(target_arch = "arm"), not(target_arch = "aarch64")))'.dependencies]
 jemallocator = {version = "0.3", features = ["disable_initial_exec_tls"]}
 
 [target.'cfg(windows)'.dependencies]

packages/bcrypt/npm/freebsd-x64/README.md

@@ -0,0 +1,3 @@
+# `@node-rs/bcrypt-freebsd-x64`
+
+This is the **x86_64-unknown-freebsd** binary for `@node-rs/bcrypt`

packages/bcrypt/npm/freebsd-x64/package.json

@@ -0,0 +1,27 @@
+{
+  "name": "@node-rs/bcrypt-freebsd-x64",
+  "version": "1.2.1",
+  "os": ["freebsd"],
+  "cpu": ["x64"],
+  "main": "bcrypt.freebsd-x64.node",
+  "files": ["bcrypt.freebsd-x64.node"],
+  "description": "Rust bcrypt binding",
+  "keywords": ["bcrypt", "auth", "password", "authentication", "encryption", "crypto", "N-API", "napi-rs", "node-rs"],
+  "author": "LongYinan <[email protected]>",
+  "homepage": "https://github.com/napi-rs/node-rs",
+  "license": "MIT",
+  "engines": {
+    "node": ">= 10"
+  },
+  "publishConfig": {
+    "registry": "https://registry.npmjs.org/",
+    "access": "public"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/napi-rs/node-rs.git"
+  },
+  "bugs": {
+    "url": "https://github.com/napi-rs/node-rs/issues"
+  }
+}

packages/bcrypt/npm/linux-arm64-musl/README.md

@@ -0,0 +1,3 @@
+# `@node-rs/bcrypt-linux-arm64-musl`
+
+This is the **aarch64-unknown-linux-musl** binary for `@node-rs/bcrypt`

packages/bcrypt/npm/linux-arm64-musl/package.json

@@ -0,0 +1,27 @@
+{
+  "name": "@node-rs/bcrypt-linux-arm64-musl",
+  "version": "1.2.1",
+  "os": ["linux"],
+  "cpu": ["arm64"],
+  "main": "bcrypt.linux-arm64-musl.node",
+  "files": ["bcrypt.linux-arm64-musl.node"],
+  "description": "Rust bcrypt binding",
+  "keywords": ["bcrypt", "auth", "password", "authentication", "encryption", "crypto", "N-API", "napi-rs", "node-rs"],
+  "author": "LongYinan <[email protected]>",
+  "homepage": "https://github.com/napi-rs/node-rs",
+  "license": "MIT",
+  "engines": {
+    "node": ">= 10"
+  },
+  "publishConfig": {
+    "registry": "https://registry.npmjs.org/",
+    "access": "public"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/napi-rs/node-rs.git"
+  },
+  "bugs": {
+    "url": "https://github.com/napi-rs/node-rs/issues"
+  }
+}

packages/bcrypt/package.json

@@ -19,7 +19,9 @@
         "x86_64-unknown-linux-musl",
         "aarch64-unknown-linux-gnu",
         "aarch64-apple-darwin",
-        "aarch64-linux-android"
+        "aarch64-linux-android",
+        "x86_64-unknown-freebsd",
+        "aarch64-unknown-linux-musl"
       ]
     }
   },

packages/bcrypt/src/lib.rs

@@ -20,7 +20,13 @@ mod lib_bcrypt;
 mod salt_task;
 mod verify_task;
 
-#[cfg(all(unix, not(target_env = "musl"), not(target_arch = "aarch64")))]
+#[cfg(all(
+  unix,
+  not(target_env = "musl"),
+  not(target_os = "freebsd"),
+  not(target_arch = "arm"),
+  not(target_arch = "aarch64")
+))]
 #[global_allocator]
 static ALLOC: jemallocator::Jemalloc = jemallocator::Jemalloc;