From 40b47efc219b32cab15856b8d4148810bec5100f Mon Sep 17 00:00:00 2001 From: Bernd Storath <999999bst@gmail.com> Date: Mon, 12 May 2025 11:29:40 +0200 Subject: [PATCH] switch to armv7 --- .cargo/config.toml | 2 +- .github/workflows/ci.yml | 2 +- .github/workflows/publish.yml | 2 +- index.js | 4 +++- package.json | 4 ++-- promise.js | 4 +++- 6 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.cargo/config.toml b/.cargo/config.toml index 4afff66..4c9a2c3 100644 --- a/.cargo/config.toml +++ b/.cargo/config.toml @@ -2,5 +2,5 @@ rustflags = ["-C", "target-feature=-crt-static"] [target.aarch64-unknown-linux-musl] rustflags = ["-C", "target-feature=-crt-static"] -[target.arm-unknown-linux-musleabihf] +[target.armv7-unknown-linux-musleabihf] rustflags = ["-C", "target-feature=-crt-static"] diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a9184a1..1f4b31f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -107,7 +107,7 @@ jobs: strategy: fail-fast: false matrix: - target: [x86_64-unknown-linux-gnu, x86_64-unknown-linux-musl, aarch64-unknown-linux-gnu, aarch64-unknown-linux-musl, arm-unknown-linux-gnueabihf, arm-unknown-linux-musleabihf] + target: [x86_64-unknown-linux-gnu, x86_64-unknown-linux-musl, aarch64-unknown-linux-gnu, aarch64-unknown-linux-musl, armv7-unknown-linux-gnueabihf, armv7-unknown-linux-musleabihf] runs-on: ubuntu-latest permissions: contents: write diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index a6fd893..36d68f2 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -84,7 +84,7 @@ jobs: name: Builds (other platforms) strategy: matrix: - target: [x86_64-unknown-linux-gnu, x86_64-unknown-linux-musl, aarch64-unknown-linux-gnu, aarch64-unknown-linux-musl, arm-unknown-linux-gnueabihf, arm-unknown-linux-musleabihf] + target: [x86_64-unknown-linux-gnu, x86_64-unknown-linux-musl, aarch64-unknown-linux-gnu, aarch64-unknown-linux-musl, armv7-unknown-linux-gnueabihf, armv7-unknown-linux-musleabihf] runs-on: ubuntu-latest permissions: contents: write diff --git a/index.js b/index.js index 9ac15cc..25c5ddc 100644 --- a/index.js +++ b/index.js @@ -20,8 +20,10 @@ function requireNative() { } } // @neon-rs/load doesn't detect arm musl - if (target === "linux-arm-gnueabihf" && familySync() == MUSL) { + if (familySync() == MUSL) { + if (target === "linux-arm-gnueabihf") { target = "linux-arm-musleabihf"; + } } return require(`@libsql/${target}`); } diff --git a/package.json b/package.json index cd1209a..370caea 100644 --- a/package.json +++ b/package.json @@ -53,8 +53,8 @@ "x86_64-pc-windows-msvc": "@libsql/win32-x64-msvc", "x86_64-unknown-linux-gnu": "@libsql/linux-x64-gnu", "x86_64-unknown-linux-musl": "@libsql/linux-x64-musl", - "arm-unknown-linux-gnueabihf": "@libsql/linux-arm-gnueabihf", - "arm-unknown-linux-musleabihf": "@libsql/linux-arm-musleabihf" + "armv7-unknown-linux-gnueabihf": "@libsql/linux-arm-gnueabihf", + "armv7-unknown-linux-musleabihf": "@libsql/linux-arm-musleabihf" } }, "repository": { diff --git a/promise.js b/promise.js index 1fa6e67..e8072d0 100644 --- a/promise.js +++ b/promise.js @@ -35,8 +35,10 @@ function requireNative() { } } // @neon-rs/load doesn't detect arm musl - if (target === "linux-arm-gnueabihf" && familySync() == MUSL) { + if (familySync() == MUSL) { + if (target === "linux-arm-gnueabihf") { target = "linux-arm-musleabihf"; + } } return require(`@libsql/${target}`); }