feat: supports more architectures (#88)

seokju-na · web-flow · commit 3d8c6b684210 · 2025-04-05T21:56:59.000+09:00
diff --git a/.cargo/config.toml b/.cargo/config.toml
@@ -0,0 +1,6 @@
+[target.aarch64-unknown-linux-musl]
+linker    = "aarch64-linux-musl-gcc"
+rustflags = ["-C", "target-feature=-crt-static"]
+
+[target.x86_64-pc-windows-msvc]
+rustflags = ["-C", "target-feature=+crt-static"]
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -42,8 +42,9 @@ jobs:
           check-latest: true
           cache: yarn
       - name: Install rust
-        uses: actions-rust-lang/setup-rust-toolchain@v1
+        uses: dtolnay/rust-toolchain@stable
         with:
+          toolchain: stable
           components: rustfmt
       - name: Install taplo
         run: cargo install taplo-cli --locked
@@ -59,8 +60,9 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Install rust
-        uses: actions-rust-lang/setup-rust-toolchain@v1
+        uses: dtolnay/rust-toolchain@stable
         with:
+          toolchain: stable
           components: clippy
       - name: Run clippy
         run: cargo clippy
@@ -79,6 +81,9 @@ jobs:
           - host: windows-latest
             target: x86_64-pc-windows-msvc
             build: yarn build --target x86_64-pc-windows-msvc
+          - host: windows-latest
+            target: aarch64-pc-windows-msvc
+            build: yarn build --target aarch64-pc-windows-msvc
           - host: ubuntu-latest
             target: x86_64-unknown-linux-gnu
             docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-debian
@@ -91,6 +96,32 @@ jobs:
               set -e &&
               apk add perl &&
               yarn build
+          - host: ubuntu-latest
+            target: aarch64-unknown-linux-gnu
+            docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-debian-aarch64
+            build: |-
+              # `perl` needs for building openssl
+              set -e &&
+              apt-get update &&
+              apt-get install -y perl &&
+              unset CC_aarch64_unknown_linux_gnu &&
+              unset CXX_aarch64_unknown_linux_gnu &&
+              yarn build --target aarch64-unknown-linux-gnu
+          - host: ubuntu-latest
+            target: aarch64-unknown-linux-musl
+            docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-alpine
+            build: |-
+              # `perl` needs for building openssl
+              set -e &&
+              apk add perl &&
+              rustup target add aarch64-unknown-linux-musl &&
+              yarn build --target aarch64-unknown-linux-musl
+          - host: ubuntu-latest
+            target: aarch64-linux-android
+            build: yarn build --target aarch64-linux-android
+          - host: ubuntu-latest
+            target: armv7-linux-androideabi
+            build: yarn build --target armv7-linux-androideabi
     name: stable - ${{ matrix.settings.target }} - node@20
     runs-on: ${{ matrix.settings.host }}
     steps:
@@ -103,10 +134,11 @@ jobs:
           check-latest: true
           cache: yarn
       - name: Install rust
-        uses: actions-rust-lang/setup-rust-toolchain@v1
+        uses: dtolnay/rust-toolchain@stable
         if: ${{ !matrix.settings.docker }}
         with:
-          target: ${{ matrix.settings.target }}
+          toolchain: stable
+          targets: ${{ matrix.settings.target }}
       - name: Cache cargo
         uses: actions/cache@v4
         with:
@@ -175,8 +207,6 @@ jobs:
         shell: bash
       - name: Test bindings
         run: yarn vitest run
-        env:
-          TEST_GITHUB_TOKEN: ${{ secrets.TEST_GITHUB_TOKEN }}
   test-windows-binding:
     name: Test bindings on ${{ matrix.settings.target }} - node@${{ matrix.node }}
     needs:
@@ -211,8 +241,6 @@ jobs:
         shell: bash
       - name: Test bindings
         run: yarn vitest run
-        env:
-          TEST_GITHUB_TOKEN: ${{ secrets.TEST_GITHUB_TOKEN }}
   test-linux-x64-gnu-binding:
     name: Test bindings on Linux-x64-gnu - node@${{ matrix.node }}
     needs:
@@ -243,7 +271,7 @@ jobs:
         run: ls -R .
         shell: bash
       - name: Test bindings
-        run: docker run --rm -e TEST_GITHUB_TOKEN=${{ secrets.TEST_GITHUB_TOKEN }} -v $(pwd):/build -w /build node:${{ matrix.node }}-slim yarn vitest run
+        run: docker run --rm -v $(pwd):/build -w /build node:${{ matrix.node }}-slim yarn vitest run
   test-linux-x64-musl-binding:
     name: Test bindings on x86_64-unknown-linux-musl - node@${{ matrix.node }}
     needs:
@@ -276,4 +304,43 @@ jobs:
         run: ls -R .
         shell: bash
       - name: Test bindings
-        run: docker run --rm -e TEST_GITHUB_TOKEN=${{ secrets.TEST_GITHUB_TOKEN }} -v $(pwd):/build -w /build node:${{ matrix.node }}-alpine yarn vitest run
+        run: docker run --rm -v $(pwd):/build -w /build node:${{ matrix.node }}-alpine yarn vitest run
+  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
+        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: '--user 0:0 --platform linux/arm64 -v ${{ github.workspace }}:/build -w /build'
+          run: |
+            set -e
+            yarn vitest run
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -22,8 +22,11 @@ jobs:
             target: aarch64-apple-darwin
             build: yarn build --target aarch64-apple-darwin
           - host: windows-latest
-            build: yarn build --target x86_64-pc-windows-msvc
             target: x86_64-pc-windows-msvc
+            build: yarn build --target x86_64-pc-windows-msvc
+          - host: windows-latest
+            target: aarch64-pc-windows-msvc
+            build: yarn build --target aarch64-pc-windows-msvc
           - host: ubuntu-latest
             target: x86_64-unknown-linux-gnu
             docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-debian
@@ -36,7 +39,33 @@ jobs:
               set -e &&
               apk add perl &&
               yarn build
-    name: stable - ${{ matrix.settings.target }} - node@20
+          - host: ubuntu-latest
+            target: aarch64-unknown-linux-gnu
+            docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-debian-aarch64
+            build: |-
+              # `perl` needs for building openssl
+              set -e &&
+              apt-get update &&
+              apt-get install -y perl &&
+              unset CC_aarch64_unknown_linux_gnu &&
+              unset CXX_aarch64_unknown_linux_gnu &&
+              yarn build --target aarch64-unknown-linux-gnu
+          - host: ubuntu-latest
+            target: aarch64-unknown-linux-musl
+            docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-alpine
+            build: |-
+              # `perl` needs for building openssl
+              set -e &&
+              apk add perl &&
+              rustup target add aarch64-unknown-linux-musl &&
+              yarn build --target aarch64-unknown-linux-musl
+          - host: ubuntu-latest
+            target: aarch64-linux-android
+            build: yarn build --target aarch64-linux-android
+          - host: ubuntu-latest
+            target: armv7-linux-androideabi
+            build: yarn build --target armv7-linux-androideabi
+    name: stable - ${{ matrix.settings.target }}
     runs-on: ${{ matrix.settings.host }}
     steps:
       - uses: actions/checkout@v4
@@ -48,10 +77,11 @@ jobs:
           check-latest: true
           cache: yarn
       - name: Install rust
-        uses: actions-rust-lang/setup-rust-toolchain@v1
+        uses: dtolnay/rust-toolchain@stable
         if: ${{ !matrix.settings.docker }}
         with:
-          target: ${{ matrix.settings.target }}
+          toolchain: stable
+          targets: ${{ matrix.settings.target }}
       - name: Cache cargo
         uses: actions/cache@v4
         with:
diff --git a/.gitignore b/.gitignore
@@ -200,3 +200,6 @@ $RECYCLE.BIN/
 
 # npm folders
 npm
+
+# tmp
+/tmp
diff --git a/.yarnrc.yml b/.yarnrc.yml
@@ -5,3 +5,5 @@ nodeLinker: node-modules
 preferReuse: true
 
 yarnPath: .yarn/releases/yarn-4.6.0.cjs
+
+httpRetry: 10
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -10,12 +10,12 @@ crate-type = ["cdylib"]
 bitflags    = "2.1.0"
 chrono      = "0.4"
 git2        = { version = "0.20.0", features = ["vendored-libgit2", "vendored-openssl"] }
-napi        = { version = "2.16.13", default-features = false, features = ["napi6", "chrono_date"] }
-napi-derive = "2.16.12"
+napi        = { version = "2.16.17", default-features = false, features = ["napi6", "chrono_date"] }
+napi-derive = "2.16.13"
 thiserror   = "2.0.3"
 
 [build-dependencies]
-napi-build = "2.1.3"
+napi-build = "2.1.6"
 
 [profile.release]
 lto = true
diff --git a/package.json b/package.json
@@ -22,8 +22,13 @@
         "x86_64-apple-darwin",
         "aarch64-apple-darwin",
         "x86_64-pc-windows-msvc",
+        "aarch64-pc-windows-msvc",
         "x86_64-unknown-linux-gnu",
-        "x86_64-unknown-linux-musl"
+        "x86_64-unknown-linux-musl",
+        "aarch64-linux-android",
+        "aarch64-unknown-linux-gnu",
+        "aarch64-unknown-linux-musl",
+        "armv7-linux-androideabi"
       ]
     }
   },
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
diff --git a/tests/repository.spec.ts b/tests/repository.spec.ts
@@ -2,7 +2,7 @@ import fs from 'node:fs/promises';
 import path from 'node:path';
 import { describe, expect, it } from 'vitest';
 import { cloneRepository, initRepository, openRepository } from '../index';
-import { isCI, isTarget } from './env';
+import { isTarget } from './env';
 import { useFixture } from './fixtures';
 import { makeTmpDir } from './tmp';
 
@@ -41,7 +41,7 @@ describe('Repository', () => {
 
   it('error if given path is not git repository', async () => {
     const p = await useFixture('notgit');
-    await expect(openRepository(p)).rejects.toThrowError(/libgit2 error: could not find repository/);
+    await expect(openRepository(p)).rejects.toThrowError();
   });
 
   it('clone from local', async () => {
@@ -57,21 +57,6 @@ describe('Repository', () => {
     expect(repo.state()).toBe('Clean');
   });
 
-  // If an action is executed by another contributor, it will not be authenticate properly.
-  // So turn off the test.
-  it('clone from remote with credential', { skip: true }, async () => {
-    const p = await makeTmpDir('clone');
-    const repo = await cloneRepository('https://github.com/seokju-na/dummy-repo-private', p, {
-      fetch: {
-        credential: {
-          type: 'Plain',
-          password: process.env.TEST_GITHUB_TOKEN!,
-        },
-      },
-    });
-    expect(repo.state()).toBe('Clean');
-  });
-
   it('get head', async () => {
     const p = await useFixture('commits');
     const repo = await openRepository(p);
diff --git a/tests/tmp.ts b/tests/tmp.ts
@@ -2,7 +2,11 @@ import { getRandomValues } from 'node:crypto';
 import fs from 'node:fs/promises';
 import os from 'node:os';
 import path from 'node:path';
+import { fileURLToPath } from 'node:url';
 import { afterAll } from 'vitest';
+import { isTarget } from './env';
+
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
 
 const tmpDirs: string[] = [];
 
@@ -12,7 +16,9 @@ afterAll(async () => {
 });
 
 export async function makeTmpDir(prefix?: string) {
-  const tmpdir = path.join(os.tmpdir(), 'es-git', prefix ?? '', randomHex(8));
+  const tmpdir = isTarget('linux', 'arm64')
+    ? path.join(__dirname, '..', 'tmp', 'es-git', prefix ?? '', randomHex(8))
+    : path.join(os.tmpdir(), 'es-git', prefix ?? '', randomHex(8));
   await fs.mkdir(tmpdir, { recursive: true });
   tmpDirs.push(tmpdir);
   return tmpdir;

-Original file line number
+Diff line change
 # npm folders
 npm
++
 +# tmp
 +/tmp