feat: support 2 more platforms (#39)

* feat: support 2 more platforms * fix
napi-rs · Jul 21, 2024 · a3f828f · a3f828f
1 parent 908bb09
commit a3f828f
Show file tree

Hide file tree

Showing 10 changed files with 317 additions and 385 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -63,6 +63,18 @@ jobs:
           - host: ubuntu-latest
             target: aarch64-unknown-linux-musl
             build: yarn build --target aarch64-unknown-linux-musl -x
+          - host: ubuntu-latest
+            target: powerpc64le-unknown-linux-gnu
+            build: |
+              sudo apt-get update
+              sudo apt-get install -y gcc-powerpc64le-linux-gnu
+              yarn build --target powerpc64le-unknown-linux-gnu
+          - host: ubuntu-latest
+            target: s390x-unknown-linux-gnu
+            build: |
+              sudo apt-get update
+              sudo apt-get install -y gcc-s390x-linux-gnu
+              yarn build --target s390x-unknown-linux-gnu
           - host: windows-latest
             target: aarch64-pc-windows-msvc
             build: yarn build --target aarch64-pc-windows-msvc
@@ -95,16 +107,21 @@ jobs:
         uses: actions/cache@v4
         with:
           path: |
-            ~/.cargo/registry/index/
-            ~/.cargo/registry/cache/
-            ~/.cargo/git/db/
+            ~/.cargo
             ~/.napi-rs
             target/
           key: ${{ matrix.settings.target }}-cargo-${{ matrix.settings.host }}
       - uses: goto-bus-stop/setup-zig@v2
         if: ${{ contains(matrix.settings.target, 'musl') }}
         with:
           version: 0.13.0
+      - name: Install cargo-zigbuild
+        uses: taiki-e/install-action@v2
+        if: ${{ contains(matrix.settings.target, 'musl') }}
+        env:
+          GITHUB_TOKEN: ${{ github.token }}
+        with:
+          tool: cargo-zigbuild
       - name: Setup toolchain
         run: ${{ matrix.settings.setup }}
         if: ${{ matrix.settings.setup }}
@@ -219,16 +236,30 @@ jobs:
         shell: bash
       - name: Test bindings
         run: yarn test
-  test-linux-x64-gnu-binding:
-    name: Test bindings on Linux-x64-gnu - node@${{ matrix.node }}
+  test-linux-binding:
+    name: Test ${{ matrix.target }} - node@${{ matrix.node }}
     needs:
       - build
     strategy:
       fail-fast: false
       matrix:
+        target:
+          - x86_64-unknown-linux-gnu
+          - x86_64-unknown-linux-musl
+          - aarch64-unknown-linux-gnu
+          - aarch64-unknown-linux-musl
+          - armv7-unknown-linux-gnueabihf
+          - s390x-unknown-linux-gnu
+          - powerpc64le-unknown-linux-gnu
         node:
           - '18'
           - '20'
+        exclude:
+          # too slow
+          - target: aarch64-unknown-linux-gnu
+            node: '18'
+          - target: s390x-unknown-linux-gnu
+            node: '18'
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -237,162 +268,55 @@ jobs:
         with:
           node-version: ${{ matrix.node }}
           cache: yarn
-      - name: Install dependencies
-        run: yarn install
-      - name: Download artifacts
-        uses: actions/download-artifact@v4
-        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):/build -w /build node:${{ matrix.node }}-slim yarn test
-  test-linux-x64-musl-binding:
-    name: Test bindings on x86_64-unknown-linux-musl - node@${{ matrix.node }}
-    needs:
-      - build
-    strategy:
-      fail-fast: false
-      matrix:
-        node:
-          - '18'
-          - '20'
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: Setup node
-        uses: actions/setup-node@v4
-        with:
-          node-version: ${{ matrix.node }}
-          cache: yarn
-      - name: Install dependencies
-        run: |
-          yarn config set supportedArchitectures.libc "musl"
-          yarn install
-      - name: Download artifacts
-        uses: actions/download-artifact@v4
-        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):/build -w /build node:${{ matrix.node }}-alpine yarn test
-  test-linux-aarch64-gnu-binding:
-    name: Test bindings on aarch64-unknown-linux-gnu - node@${{ matrix.node }}
-    needs:
-      - build
-    strategy:
-      fail-fast: false
-      matrix:
-        node:
-          - '18'
-          - '20'
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: Download artifacts
-        uses: actions/download-artifact@v4
-        with:
-          name: bindings-aarch64-unknown-linux-gnu
-          path: .
-      - name: List packages
-        run: ls -R .
-        shell: bash
-      - name: Install dependencies
+      - name: Output docker params
+        id: docker
         run: |
-          yarn config set supportedArchitectures.cpu "arm64"
-          yarn config set supportedArchitectures.libc "glibc"
-          yarn install
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-        with:
-          platforms: arm64
-      - run: docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
-      - name: Setup and run tests
-        uses: addnab/docker-run-action@v3
-        with:
-          image: node:${{ matrix.node }}-slim
-          options: '--platform linux/arm64 -v ${{ github.workspace }}:/build -w /build'
-          run: |
-            set -e
-            yarn test
-            ls -la
-  test-linux-aarch64-musl-binding:
-    name: Test bindings on aarch64-unknown-linux-musl - node@lts
-    needs:
-      - build
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: Download artifacts
-        uses: actions/download-artifact@v4
-        with:
-          name: bindings-aarch64-unknown-linux-musl
-          path: .
-      - name: List packages
-        run: ls -R .
-        shell: bash
+          node -e "
+            if ('${{ matrix.target }}'.startsWith('aarch64')) {
+              console.log('PLATFORM=linux/arm64')
+            } else if ('${{ matrix.target }}'.startsWith('armv7')) {
+              console.log('PLATFORM=linux/arm/v7')
+            } else if ('${{ matrix.target }}'.startsWith('powerpc64le')) {
+              console.log('PLATFORM=linux/ppc64le')
+            } else if ('${{ matrix.target }}'.startsWith('s390x')) {
+              console.log('PLATFORM=linux/s390x')
+            } else {
+              console.log('PLATFORM=linux/amd64')
+            }
+          " >> $GITHUB_OUTPUT
+          node -e "
+            if ('${{ matrix.target }}'.endsWith('-musl')) {
+              console.log('IMAGE=node:${{ matrix.node }}-alpine')
+            } else {
+              console.log('IMAGE=node:${{ matrix.node }}-slim')
+            }
+          " >> $GITHUB_OUTPUT
       - name: Install dependencies
         run: |
-          yarn config set supportedArchitectures.cpu "arm64"
-          yarn config set supportedArchitectures.libc "musl"
+          yarn config set --json supportedArchitectures.os '["current", "linux"]'
+          yarn config set --json supportedArchitectures.cpu '["current", "arm64", "arm", "ppc64", "s390x", "x64"]'
+          yarn config set --json supportedArchitectures.libc '["current", "glibc", "musl"]'
           yarn install
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-        with:
-          platforms: arm64
-      - run: docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
-      - name: Setup and run tests
-        uses: addnab/docker-run-action@v3
-        with:
-          image: node:lts-alpine
-          options: '--platform linux/arm64 -v ${{ github.workspace }}:/build -w /build'
-          run: |
-            set -e
-            yarn test
-  test-linux-arm-gnueabihf-binding:
-    name: Test bindings on armv7-unknown-linux-gnueabihf - node@${{ matrix.node }}
-    needs:
-      - build
-    strategy:
-      fail-fast: false
-      matrix:
-        node:
-          - '18'
-          - '20'
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
       - name: Download artifacts
         uses: actions/download-artifact@v4
         with:
-          name: bindings-armv7-unknown-linux-gnueabihf
+          name: bindings-${{ matrix.target }}
           path: .
       - name: List packages
         run: ls -R .
         shell: bash
-      - name: Install dependencies
-        run: |
-          yarn config set supportedArchitectures.cpu "arm"
-          yarn install
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
         with:
-          platforms: arm
+          platforms: all
       - run: docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
-      - name: Setup and run tests
+      - name: Test bindings
         uses: addnab/docker-run-action@v3
         with:
-          image: node:${{ matrix.node }}-slim
-          options: '--platform linux/arm/v7 -v ${{ github.workspace }}:/build -w /build'
-          run: |
-            set -e
-            yarn test
-            ls -la
+          image: ${{ steps.docker.outputs.IMAGE }}
+          options: -v ${{ github.workspace }}:${{ github.workspace }} -w ${{ github.workspace }} --platform ${{ steps.docker.outputs.PLATFORM }}
+          run: yarn run test
+
   test-nodejs-wasi:
     name: Test bindings on wasm32-wasi - node@${{ matrix.node }}
     needs:
@@ -431,11 +355,7 @@ jobs:
     needs:
       - build-freebsd
       - test-macOS-windows-binding
-      - test-linux-x64-gnu-binding
-      - test-linux-x64-musl-binding
-      - test-linux-aarch64-gnu-binding
-      - test-linux-aarch64-musl-binding
-      - test-linux-arm-gnueabihf-binding
+      - test-linux-binding
       - test-nodejs-wasi
     steps:
       - uses: actions/checkout@v4

diff --git a/__test__/index.spec.ts b/__test__/index.spec.ts
@@ -4,6 +4,9 @@ import { join } from 'node:path'
 import test from 'ava'
 
 import { Archive } from '../index'
+import { fileURLToPath } from 'node:url'
+
+const __dirname = join(fileURLToPath(import.meta.url), '..')
 
 test('should be able to read archive', (t) => {
   const archive = new Archive(join(__dirname, 'src.tar'))

diff --git a/__test__/package.json b/__test__/package.json
@@ -0,0 +1,3 @@
+{
+  "type": "module"
+}
diff --git a/__test__/tsconfig.json b/__test__/tsconfig.json
@@ -0,0 +1,10 @@
+{
+  "extends": "../tsconfig.json",
+  "compilerOptions": {
+    "module": "ESNext",
+    "moduleResolution": "Bundler",
+    "outDir": "./dist"
+  },
+  "include": ["."],
+  "exclude": []
+}
diff --git a/benchmark/bench.ts b/benchmark/bench.ts
@@ -1,10 +1,13 @@
 import { readFileSync } from 'node:fs'
 import { join } from 'node:path'
 
-import b from 'benny'
+import { Bench } from 'tinybench'
 import { list } from 'tar'
 
 import { Archive } from '../index'
+import { fileURLToPath } from 'node:url'
+
+const __dirname = join(fileURLToPath(import.meta.url), '..')
 
 const ARCHIVE_PATH = join(__dirname, '..', '__test__', 'src.tar.gz')
 
@@ -22,33 +25,26 @@ for (const entry of archive.entries()) {
   console.info('list from @napi-rs/tar', entry.path())
 }
 
-async function run() {
-  await b.suite(
-    'Read all entries',
-
-    b.add('@napi-rs/tar', () => {
-      const archiveBuffer = readFileSync(ARCHIVE_PATH)
-      const archive = new Archive(archiveBuffer)
-      for (const entry of archive.entries()) {
-        entry.path()
-      }
-    }),
-
-    b.add('node-tar', () => {
-      list({
-        file: join(__dirname, '..', '__test__', 'src.tar.gz'),
-        onentry: (entry) => {
-          entry.path
-        },
-        sync: true,
-      })
-    }),
-
-    b.cycle(),
-    b.complete(),
-  )
-}
+const b = new Bench()
+
+b.add('@napi-rs/tar', () => {
+  const archiveBuffer = readFileSync(ARCHIVE_PATH)
+  const archive = new Archive(archiveBuffer)
+  for (const entry of archive.entries()) {
+    entry.path()
+  }
+})
 
-run().catch((e) => {
-  console.error(e)
+b.add('node-tar', () => {
+  list({
+    file: join(__dirname, '..', '__test__', 'src.tar.gz'),
+    onentry: (entry) => {
+      entry.path
+    },
+    sync: true,
+  })
 })
+
+await b.run()
+
+console.table(b.table())
diff --git a/benchmark/package.json b/benchmark/package.json
@@ -0,0 +1,3 @@
+{
+  "type": "module"
+}
diff --git a/benchmark/tsconfig.json b/benchmark/tsconfig.json
@@ -0,0 +1,5 @@
+{
+  "extends": "../__test__/tsconfig.json",
+  "include": ["."],
+  "exclude": []
+}