Merge pull request #290 from napi-rs/upgrade-workflow

chore: upgrade to latest ci template

.eslintrc.yml

@@ -3,7 +3,7 @@ parser: '@typescript-eslint/parser'
 parserOptions:
   ecmaFeatures:
     jsx: true
-  ecmaVersion: 2020
+  ecmaVersion: latest
   sourceType: module
 
 env:

.github/dependabot.yml

@@ -1,24 +0,0 @@
-# Basic dependabot.yml file with
-# minimum configuration for two package managers
-
-version: 2
-updates:
-  # Enable version updates for npm
-  - package-ecosystem: 'npm'
-    directory: '/'
-    schedule:
-      interval: 'weekly'
-    # Specify labels for npm pull requests
-    labels:
-      - 'npm'
-      - 'dependencies'
-    versioning-strategy: increase
-
-  # Enable version updates for Docker
-  - package-ecosystem: 'cargo'
-    directory: '/'
-    schedule:
-      interval: 'weekly'
-    labels:
-      - 'rust'
-      - 'dependencies'

.github/workflows/CI.yaml

@@ -1,8 +1,7 @@
 name: CI
-
 env:
-  DEBUG: 'napi:*'
-  APP_NAME: 'package-template'
+  DEBUG: napi:*
+  APP_NAME: package-template
   MACOSX_DEPLOYMENT_TARGET: '10.13'
 
 on:
@@ -11,88 +10,96 @@ on:
       - main
     tags-ignore:
       - '**'
-  pull_request:
+  pull_request: null
 
 jobs:
   build:
     if: "!contains(github.event.head_commit.message, 'skip ci')"
-
     strategy:
       fail-fast: false
       matrix:
         settings:
           - host: macos-latest
-            target: 'x86_64-apple-darwin'
-            build: yarn build
+            target: x86_64-apple-darwin
+            build: |
+              yarn build
+              strip -x *.node
           - host: windows-latest
             build: yarn build
-            target: 'x86_64-pc-windows-msvc'
+            target: x86_64-pc-windows-msvc
           - host: windows-latest
             build: |
               export CARGO_PROFILE_RELEASE_CODEGEN_UNITS=32;
               export CARGO_PROFILE_RELEASE_LTO=false
               yarn build --target i686-pc-windows-msvc
               yarn test
-            target: 'i686-pc-windows-msvc'
+            target: i686-pc-windows-msvc
             setup: |
               choco install nodejs-lts --x86 -y --force
-              echo "C:\\Program Files (x86)\\nodejs" >> $GITHUB_PATH
+              echo "C:\Program Files (x86)\nodejs" >> $GITHUB_PATH
           - host: ubuntu-latest
-            target: 'x86_64-unknown-linux-gnu'
+            target: x86_64-unknown-linux-gnu
             docker: |
               docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD $DOCKER_REGISTRY_URL
               docker pull $DOCKER_REGISTRY_URL/napi-rs/napi-rs/nodejs-rust:lts-debian
               docker tag $DOCKER_REGISTRY_URL/napi-rs/napi-rs/nodejs-rust:lts-debian builder
             build: |
-              docker run --rm -v ~/.cargo/git:/root/.cargo/git -v ~/.cargo/registry:/root/.cargo/registry -v $(pwd):/build -w /build builder yarn build
+              docker run --rm -v ~/.cargo/git:/root/.cargo/git -v ~/.cargo/registry:/root/.cargo/registry -v $(pwd):/build -w /build builder yarn build && strip package-template.linux-x64-gnu.node
           - host: ubuntu-latest
-            target: 'x86_64-unknown-linux-musl'
+            target: x86_64-unknown-linux-musl
             docker: |
               docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD $DOCKER_REGISTRY_URL
               docker pull $DOCKER_REGISTRY_URL/napi-rs/napi-rs/nodejs-rust:lts-alpine
               docker tag $DOCKER_REGISTRY_URL/napi-rs/napi-rs/nodejs-rust:lts-alpine builder
-            build: docker run --rm -v ~/.cargo/git:/root/.cargo/git -v ~/.cargo/registry:/root/.cargo/registry -v $(pwd):/build -w /build builder yarn build
+            build: docker run --rm -v ~/.cargo/git:/root/.cargo/git -v ~/.cargo/registry:/root/.cargo/registry -v $(pwd):/build -w /build builder yarn build && strip package-template.linux-x64-musl.node
           - host: macos-latest
-            target: 'aarch64-apple-darwin'
-            build: yarn build --target=aarch64-apple-darwin
+            target: aarch64-apple-darwin
+            build: |
+              yarn build --target=aarch64-apple-darwin
+              strip -x *.node
           - host: ubuntu-latest
-            target: 'aarch64-unknown-linux-gnu'
+            target: aarch64-unknown-linux-gnu
             setup: |
+              sudo apt-get update
               sudo apt-get install g++-aarch64-linux-gnu gcc-aarch64-linux-gnu -y
-            build: yarn build --target=aarch64-unknown-linux-gnu
+            build: |
+              yarn build --target=aarch64-unknown-linux-gnu
+              aarch64-linux-gnu-strip package-template.linux-arm64-gnu.node
           - host: ubuntu-latest
-            target: 'armv7-unknown-linux-gnueabihf'
+            target: armv7-unknown-linux-gnueabihf
             setup: |
+              sudo apt-get update
               sudo apt-get install gcc-arm-linux-gnueabihf g++-arm-linux-gnueabihf -y
-            build: yarn build --target=armv7-unknown-linux-gnueabihf
+            build: |
+              yarn build --target=armv7-unknown-linux-gnueabihf
+              arm-linux-gnueabihf-strip package-template.linux-arm-gnueabihf.node
           - host: ubuntu-latest
-            target: 'aarch64-linux-android'
+            target: aarch64-linux-android
             build: |
               export CARGO_TARGET_AARCH64_LINUX_ANDROID_LINKER="${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android24-clang"
               yarn build --target aarch64-linux-android
+              ${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android-strip *.node
           - host: ubuntu-latest
-            target: 'aarch64-unknown-linux-musl'
+            target: aarch64-unknown-linux-musl
+            downloadTarget: aarch64-unknown-linux-musl
             docker: |
               docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD $DOCKER_REGISTRY_URL
               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
-            build: docker run --rm -v ~/.cargo/git:/root/.cargo/git -v ~/.cargo/registry:/root/.cargo/registry -v $(pwd):/package-template -w /package-template builder sh -c "yarn build -- --target=aarch64-unknown-linux-musl"
+            build: |
+              docker run --rm -v ~/.cargo/git:/root/.cargo/git -v ~/.cargo/registry:/root/.cargo/registry -v $(pwd):/build -w /build builder sh -c "yarn build --target=aarch64-unknown-linux-musl && /aarch64-linux-musl-cross/bin/aarch64-linux-musl-strip package-template.linux-arm64-musl.node"
           - host: windows-latest
-            target: 'aarch64-pc-windows-msvc'
+            target: aarch64-pc-windows-msvc
             build: yarn build --target aarch64-pc-windows-msvc
-
     name: stable - ${{ matrix.settings.target }} - node@14
     runs-on: ${{ matrix.settings.host }}
-
     steps:
       - uses: actions/checkout@v2
-
       - name: Setup node
         uses: actions/setup-node@v2
         with:
           node-version: 14
           check-latest: true
-
       - name: Install
         uses: actions-rs/toolchain@v1
         with:
@@ -100,30 +107,25 @@ jobs:
           override: true
           toolchain: stable
           target: ${{ matrix.settings.target }}
-
       - name: Generate Cargo.lock
         uses: actions-rs/cargo@v1
         with:
           command: generate-lockfile
-
       - name: Cache cargo registry
-        uses: actions/cache@v1
+        uses: actions/cache@v2
         with:
           path: ~/.cargo/registry
           key: ${{ matrix.settings.target }}-node@14-cargo-registry-trimmed-${{ hashFiles('**/Cargo.lock') }}
-
       - name: Cache cargo index
-        uses: actions/cache@v1
+        uses: actions/cache@v2
         with:
           path: ~/.cargo/git
           key: ${{ matrix.settings.target }}-node@14-cargo-index-trimmed-${{ hashFiles('**/Cargo.lock') }}
-
       - name: Cache NPM dependencies
-        uses: actions/cache@v1
+        uses: actions/cache@v2
         with:
           path: node_modules
           key: npm-cache-${{ matrix.settings.target }}-node@14-${{ hashFiles('yarn.lock') }}
-
       - name: Pull latest image
         run: ${{ matrix.settings.docker }}
         env:
@@ -131,25 +133,20 @@ jobs:
           DOCKER_USERNAME: ${{ github.actor }}
           DOCKER_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
         if: ${{ matrix.settings.docker }}
-
       - name: Setup toolchain
         run: ${{ matrix.settings.setup }}
         if: ${{ matrix.settings.setup }}
         shell: bash
-
-      - name: 'Install dependencies'
+      - name: Install dependencies
         run: yarn install --ignore-scripts --frozen-lockfile --registry https://registry.npmjs.org --network-timeout 300000
-
-      - name: 'Build'
+      - name: Build
         run: ${{ matrix.settings.build }}
         shell: bash
-
       - name: Upload artifact
         uses: actions/upload-artifact@v2
         with:
           name: bindings-${{ matrix.settings.target }}
           path: ${{ env.APP_NAME }}.*.node
-
   build-freebsd:
     runs-on: macos-10.15
     name: Build FreeBSD
@@ -159,16 +156,16 @@ jobs:
         id: build
         uses: vmactions/freebsd-vm@v0.1.5
         env:
-          DEBUG: 'napi:*'
+          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'
+          envs: DEBUG RUSTUP_HOME CARGO_HOME RUSTUP_IO_THREADS
           usesh: true
           mem: 3000
           prepare: |
-            pkg install -y curl python2 node14
+            pkg install -y curl node14 python2
             curl -qL https://www.npmjs.com/install.sh | sh
             npm install -g yarn
             curl https://sh.rustup.rs -sSf --output rustup.sh
@@ -192,13 +189,11 @@ jobs:
             yarn test
             rm -rf node_modules
             rm -rf target
-
       - name: Upload artifact
         uses: actions/upload-artifact@v2
         with:
           name: bindings-freebsd
           path: ${{ env.APP_NAME }}.*.node
-
   test-macOS-windows-binding:
     name: Test bindings on ${{ matrix.settings.target }} - node@${{ matrix.node }}
     needs:
@@ -207,44 +202,37 @@ jobs:
       fail-fast: false
       matrix:
         settings:
-          - host: macos-latest
-            target: 'x86_64-apple-darwin'
           - host: windows-latest
-            target: 'x86_64-pc-windows-msvc'
-        node: ['12', '14', '16']
+            target: x86_64-pc-windows-msvc
+        node:
+          - '12'
+          - '14'
+          - '16'
     runs-on: ${{ matrix.settings.host }}
-
     steps:
       - uses: actions/checkout@v2
-
       - name: Setup node
         uses: actions/setup-node@v2
         with:
           node-version: ${{ matrix.node }}
           check-latest: true
-
       - name: Cache NPM dependencies
-        uses: actions/cache@v1
+        uses: actions/cache@v2
         with:
           path: node_modules
           key: npm-cache-test-${{ matrix.settings.target }}-${{ matrix.node }}-${{ hashFiles('yarn.lock') }}
-
-      - name: 'Install dependencies'
+      - name: Install dependencies
         run: yarn install --ignore-scripts --frozen-lockfile --registry https://registry.npmjs.org --network-timeout 300000
-
       - name: Download artifacts
         uses: actions/download-artifact@v2
         with:
           name: bindings-${{ matrix.settings.target }}
           path: .
-
       - name: List packages
         run: ls -R .
         shell: bash
-
       - name: Test bindings
         run: yarn test
-
   test-linux-x64-gnu-binding:
     name: Test bindings on Linux-x64-gnu - node@${{ matrix.node }}
     needs:
@@ -252,40 +240,35 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node: ['12', '14', '16']
+        node:
+          - '12'
+          - '14'
+          - '16'
     runs-on: ubuntu-latest
-
     steps:
       - uses: actions/checkout@v2
-
       - name: Setup node
         uses: actions/setup-node@v2
         with:
           node-version: ${{ matrix.node }}
           check-latest: true
-
       - name: Cache NPM dependencies
-        uses: actions/cache@v1
+        uses: actions/cache@v2
         with:
           path: node_modules
           key: npm-cache-test-linux-x64-gnu-${{ matrix.node }}-${{ hashFiles('yarn.lock') }}
-
-      - name: 'Install dependencies'
+      - name: Install dependencies
         run: yarn install --ignore-scripts --frozen-lockfile --registry https://registry.npmjs.org --network-timeout 300000
-
       - name: Download artifacts
         uses: actions/download-artifact@v2
         with:
           name: bindings-x86_64-unknown-linux-gnu
           path: .
-
       - name: List packages
         run: ls -R .
         shell: bash
-
       - name: Test bindings
-        run: docker run --rm -v $(pwd):/${{ env.APP_NAME }} -w /${{ env.APP_NAME }} node:${{ matrix.node }}-slim yarn test
-
+        run: docker run --rm -v $(pwd):/package-template -w /package-template node:${{ matrix.node }}-slim yarn test
   test-linux-x64-musl-binding:
     name: Test bindings on x86_64-unknown-linux-musl - node@${{ matrix.node }}
     needs:
@@ -293,40 +276,35 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node: ['12', '14', '16']
+        node:
+          - '12'
+          - '14'
+          - '16'
     runs-on: ubuntu-latest
-
     steps:
       - uses: actions/checkout@v2
-
       - name: Setup node
         uses: actions/setup-node@v2
         with:
           node-version: ${{ matrix.node }}
           check-latest: true
-
       - name: Cache NPM dependencies
-        uses: actions/cache@v1
+        uses: actions/cache@v2
         with:
           path: node_modules
           key: npm-cache-test-x86_64-unknown-linux-musl-${{ matrix.node }}-${{ hashFiles('yarn.lock') }}
-
-      - name: 'Install dependencies'
+      - name: Install dependencies
         run: yarn install --ignore-scripts --frozen-lockfile --registry https://registry.npmjs.org --network-timeout 300000
-
       - name: Download artifacts
         uses: actions/download-artifact@v2
         with:
           name: bindings-x86_64-unknown-linux-musl
           path: .
-
       - name: List packages
         run: ls -R .
         shell: bash
-
       - name: Test bindings
-        run: docker run --rm -v $(pwd):/${{ env.APP_NAME }} -w /${{ env.APP_NAME }} node:${{ matrix.node }}-alpine yarn test
-
+        run: docker run --rm -v $(pwd):/package-template -w /package-template node:${{ matrix.node }}-alpine yarn test
   test-linux-aarch64-gnu-binding:
     name: Test bindings on aarch64-unknown-linux-gnu - node@${{ matrix.node }}
     needs:
@@ -334,73 +312,68 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node: ['12', '14', '16']
+        node:
+          - '12'
+          - '14'
+          - '16'
     runs-on: ubuntu-latest
-
     steps:
       - run: docker run --rm --privileged multiarch/qemu-user-static:register --reset
-
       - uses: actions/checkout@v2
-
       - name: Download artifacts
         uses: actions/download-artifact@v2
         with:
           name: bindings-aarch64-unknown-linux-gnu
           path: .
-
       - name: List packages
         run: ls -R .
         shell: bash
-
+      - name: Cache NPM dependencies
+        uses: actions/cache@v2
+        with:
+          path: node_modules
+          key: npm-cache-test-linux-aarch64-gnu-${{ matrix.node }}-${{ hashFiles('yarn.lock') }}
+      - name: Install dependencies
+        run: yarn install --ignore-scripts --ignore-platform --frozen-lockfile --registry https://registry.npmjs.org --network-timeout 300000
       - name: Setup and run tests
-        uses: docker://multiarch/ubuntu-core:arm64-focal
-        id: runcmd
+        uses: addnab/docker-run-action@v3
         with:
-          args: >
-            sh -c "
-              apt-get update && \
-              apt-get install -y ca-certificates gnupg2 curl apt-transport-https && \
-              curl -sL https://deb.nodesource.com/setup_${{ matrix.node }}.x | bash - && \
-              apt-get install -y nodejs && \
-              npm install -g yarn && \
-              yarn install --ignore-scripts --registry https://registry.npmjs.org --network-timeout 300000 && \
-              yarn test && \
-              ls -la
-            "
-
+          image: ghcr.io/napi-rs/napi-rs/nodejs:aarch64-${{ matrix.node }}
+          options: '-v ${{ github.workspace }}:/build -w /build'
+          run: |
+            yarn test
+            ls -la
   test-linux-aarch64-musl-binding:
-    name: Test bindings on aarch64-unknown-linux-musl - node@lts
+    name: Test bindings on aarch64-unknown-linux-musl - node@${{ matrix.node }}
     needs:
       - build
-
     runs-on: ubuntu-latest
-
     steps:
       - run: docker run --rm --privileged multiarch/qemu-user-static:register --reset
-
       - uses: actions/checkout@v2
-
       - name: Download artifacts
         uses: actions/download-artifact@v2
         with:
           name: bindings-aarch64-unknown-linux-musl
           path: .
-
       - name: List packages
         run: ls -R .
         shell: bash
-
+      - name: Cache NPM dependencies
+        uses: actions/cache@v2
+        with:
+          path: node_modules
+          key: npm-cache-test-linux-aarch64-musl-${{ matrix.node }}-${{ hashFiles('yarn.lock') }}
+      - name: Install dependencies
+        run: yarn install --ignore-scripts --ignore-platform --frozen-lockfile --registry https://registry.npmjs.org --network-timeout 300000
       - name: Setup and run tests
-        uses: docker://multiarch/alpine:aarch64-latest-stable
+        uses: addnab/docker-run-action@v3
         with:
-          args: >
-            sh -c "
-              apk add nodejs npm && \
-              npm install -g yarn && \
-              yarn install --ignore-scripts --registry https://registry.npmjs.org --network-timeout 300000 && \
-              npm test
-            "
-
+          image: multiarch/alpine:aarch64-latest-stable
+          options: '-v ${{ github.workspace }}:/build -w /build'
+          run: |
+            apk add nodejs npm yarn
+            yarn test
   test-linux-arm-gnueabihf-binding:
     name: Test bindings on armv7-unknown-linux-gnueabihf - node@${{ matrix.node }}
     needs:
@@ -408,83 +381,73 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node: ['12', '14', '16']
+        node:
+          - '12'
+          - '14'
+          - '16'
     runs-on: ubuntu-latest
-
     steps:
       - run: docker run --rm --privileged multiarch/qemu-user-static:register --reset
-
       - uses: actions/checkout@v2
-
       - name: Download artifacts
         uses: actions/download-artifact@v2
         with:
           name: bindings-armv7-unknown-linux-gnueabihf
           path: .
-
       - name: List packages
         run: ls -R .
         shell: bash
-
+      - name: Cache NPM dependencies
+        uses: actions/cache@v2
+        with:
+          path: node_modules
+          key: npm-cache-test-linux-arm-gnueabihf-${{ matrix.node }}-${{ hashFiles('yarn.lock') }}
+      - name: Install dependencies
+        run: yarn install --ignore-scripts --ignore-platform --frozen-lockfile --registry https://registry.npmjs.org --network-timeout 300000
       - name: Setup and run tests
-        uses: docker://multiarch/ubuntu-core:armhf-focal
-        id: runcmd
+        uses: addnab/docker-run-action@v3
         with:
-          args: >
-            sh -c "
-              apt-get update && \
-              apt-get install -y ca-certificates gnupg2 curl apt-transport-https && \
-              curl -sL https://deb.nodesource.com/setup_${{ matrix.node }}.x | bash - && \
-              apt-get install -y nodejs && \
-              npm install -g yarn && \
-              yarn install --ignore-scripts --registry https://registry.npmjs.org --network-timeout 300000 && \
-              yarn test && \
-              ls -la
-            "
-
+          image: ghcr.io/napi-rs/napi-rs/nodejs:armhf-${{ matrix.node }}
+          options: '-v ${{ github.workspace }}:/build -w /build'
+          run: |
+            yarn test
+            ls -la
   publish:
     name: Publish
     runs-on: ubuntu-latest
     needs:
+      - build-freebsd
+      - test-macOS-windows-binding
       - test-linux-x64-gnu-binding
       - test-linux-x64-musl-binding
       - test-linux-aarch64-gnu-binding
-      - test-linux-arm-gnueabihf-binding
-      - test-macOS-windows-binding
       - test-linux-aarch64-musl-binding
-      - build-freebsd
-
+      - test-linux-arm-gnueabihf-binding
     steps:
       - uses: actions/checkout@v2
-
       - name: Setup node
         uses: actions/setup-node@v2
         with:
           node-version: 14
           check-latest: true
-
       - name: Cache NPM dependencies
-        uses: actions/cache@v1
+        uses: actions/cache@v2
         with:
           path: node_modules
           key: npm-cache-ubuntu-latest-${{ hashFiles('yarn.lock') }}
           restore-keys: |
             npm-cache-
-      - name: 'Install dependencies'
+      - name: Install dependencies
         run: yarn install --ignore-scripts --frozen-lockfile --registry https://registry.npmjs.org --network-timeout 300000
-
       - name: Download all artifacts
         uses: actions/download-artifact@v2
         with:
           path: artifacts
-
       - name: Move artifacts
         run: yarn artifacts
-
       - name: List packages
         run: ls -R ./npm
         shell: bash
-
       - name: Publish
         run: |
           if git log -1 --pretty=%B | grep "^[0-9]\+\.[0-9]\+\.[0-9]\+$";

.github/workflows/auto-merge.yaml

@@ -1,20 +0,0 @@
-name: Dependabot auto merge
-
-on:
-  workflow_run:
-    types:
-      - completed
-    workflows:
-      # List all required workflow names here.
-      - 'CI'
-      - 'Lint'
-jobs:
-  merge:
-    name: Merge
-    runs-on: ubuntu-latest
-    steps:
-      - name: Auto merge
-        uses: ridedott/merge-me-action@v2
-        with:
-          GITHUB_LOGIN: 'dependabot*'
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 authors = ["LongYinan <lynweklm@gmail.com>"]
-edition = "2018"
+edition = "2021"
 name = "napi-package-template"
 version = "0.1.0"
 

package.json

@@ -48,20 +48,20 @@
     "version": "napi version"
   },
   "devDependencies": {
-    "@napi-rs/cli": "^1.3.3",
+    "@napi-rs/cli": "^1.3.4",
     "@swc-node/register": "^1.3.6",
-    "@typescript-eslint/eslint-plugin": "^4.33.0",
-    "@typescript-eslint/parser": "^4.33.0",
+    "@typescript-eslint/eslint-plugin": "^5.2.0",
+    "@typescript-eslint/parser": "^5.2.0",
     "ava": "^3.15.0",
     "benny": "^3.7.1",
     "chalk": "^4.1.2",
-    "eslint": "^7.32.0",
+    "eslint": "^8.1.0",
     "eslint-config-prettier": "^8.3.0",
     "eslint-plugin-import": "^2.25.2",
     "eslint-plugin-prettier": "^4.0.0",
     "eslint-plugin-sonarjs": "^0.10.0",
     "husky": "^7.0.4",
-    "lint-staged": "^11.2.4",
+    "lint-staged": "^11.2.6",
     "npm-run-all": "^4.1.5",
     "prettier": "^2.4.1",
     "typescript": "^4.4.4"