From bc8b53e981019d89521f6f05b760c7f6caa0fc19 Mon Sep 17 00:00:00 2001 From: fan xia Date: Sun, 1 Oct 2023 01:51:52 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BC=96=E8=AF=91=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/CI.yml | 27 ++++++++++------------ addon/npm/linux-arm-gnueabihf/README.md | 3 --- addon/npm/linux-arm-gnueabihf/package.json | 18 --------------- addon/package.json | 1 - 4 files changed, 12 insertions(+), 37 deletions(-) delete mode 100644 addon/npm/linux-arm-gnueabihf/README.md delete mode 100644 addon/npm/linux-arm-gnueabihf/package.json diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index ee82042..f259105 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -47,12 +47,11 @@ jobs: sudo apt-get update && sudo apt-get install uuid-dev libc-dev pkg-config libglib2.0-dev libgtk-3-dev gcc-arm-linux-gnueabihf libgtk2.0-dev libpango1.0-dev libcairo2-dev libfontconfig1-dev -y && set -e && - pnpm build --target x86_64-unknown-linux-gnu && - strip *.node + pnpm build --target x86_64-unknown-linux-gnu - host: ubuntu-20.04 target: x86_64-unknown-linux-musl docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-alpine - build: apk update && apk add libuuid libc-dev pkgconfig glib-dev gtk+3.0-dev pango-dev cairo fontconfig && set -e && pnpm build && strip *.node + build: apk update && apk add libuuid libc-dev pkgconfig glib-dev gtk+3.0-dev pango-dev cairo fontconfig && set -e && pnpm build - host: macos-latest target: aarch64-apple-darwin build: | @@ -65,16 +64,15 @@ jobs: sudo apt-get update && sudo apt-get install uuid-dev libc-dev pkg-config libglib2.0-dev libgtk-3-dev gcc-arm-linux-gnueabihf libgtk2.0-dev libpango1.0-dev libcairo2-dev libfontconfig1-dev -y && set -e && - PKG_CONFIG_SYSROOT_DIR=/ pnpm build --target aarch64-unknown-linux-gnu && - aarch64-unknown-linux-gnu-strip *.node - - host: ubuntu-20.04 - target: armv7-unknown-linux-gnueabihf - setup: | - sudo apt-get update - sudo apt-get install uuid-dev libc-dev pkg-config libglib2.0-dev libgtk-3-dev gcc-arm-linux-gnueabihf libgtk2.0-dev libpango1.0-dev libcairo2-dev libfontconfig1-dev -y - build: | - PKG_CONFIG_SYSROOT_DIR=/ pnpm build --target armv7-unknown-linux-gnueabihf - arm-linux-gnueabihf-strip *.node + PKG_CONFIG_SYSROOT_DIR=/ pnpm build --target aarch64-unknown-linux-gnu + # - host: ubuntu-20.04 + # target: armv7-unknown-linux-gnueabihf + # setup: | + # sudo apt-get update + # sudo apt-get install uuid-dev libc-dev pkg-config libglib2.0-dev libgtk-3-dev gcc-arm-linux-gnueabihf libgtk2.0-dev libpango1.0-dev libcairo2-dev libfontconfig1-dev -y + # build: | + # PKG_CONFIG_SYSROOT_DIR=/ pnpm build --target armv7-unknown-linux-gnueabihf + # arm-linux-gnueabihf-strip *.node - host: ubuntu-20.04 target: aarch64-unknown-linux-musl docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-alpine @@ -82,8 +80,7 @@ jobs: apk update && apk add libuuid libc-dev pkgconfig glib-dev gtk+3.0-dev pango-dev cairo fontconfig && set -e && rustup target add aarch64-unknown-linux-musl && - PKG_CONFIG_SYSROOT_DIR=/ pnpm build --target aarch64-unknown-linux-musl && - /aarch64-linux-musl-cross/bin/aarch64-linux-musl-strip *.node + PKG_CONFIG_SYSROOT_DIR=/ pnpm build --target aarch64-unknown-linux-musl - host: windows-latest target: aarch64-pc-windows-msvc build: pnpm build --target aarch64-pc-windows-msvc diff --git a/addon/npm/linux-arm-gnueabihf/README.md b/addon/npm/linux-arm-gnueabihf/README.md deleted file mode 100644 index b725d2b..0000000 --- a/addon/npm/linux-arm-gnueabihf/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# `rubick-native-addon-linux-arm-gnueabihf` - -This is the **armv7-unknown-linux-gnueabihf** binary for `rubick-native-addon` diff --git a/addon/npm/linux-arm-gnueabihf/package.json b/addon/npm/linux-arm-gnueabihf/package.json deleted file mode 100644 index 2a05236..0000000 --- a/addon/npm/linux-arm-gnueabihf/package.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "name": "rubick-native-addon-linux-arm-gnueabihf", - "version": "0.0.0", - "os": [ - "linux" - ], - "cpu": [ - "arm" - ], - "main": "rubick-native-addon.linux-arm-gnueabihf.node", - "files": [ - "rubick-native-addon.linux-arm-gnueabihf.node" - ], - "license": "MIT", - "engines": { - "node": ">= 10" - } -} \ No newline at end of file diff --git a/addon/package.json b/addon/package.json index e2ba922..c13e6ba 100644 --- a/addon/package.json +++ b/addon/package.json @@ -11,7 +11,6 @@ "aarch64-unknown-linux-gnu", "aarch64-unknown-linux-musl", "aarch64-pc-windows-msvc", - "armv7-unknown-linux-gnueabihf", "x86_64-unknown-linux-musl", "i686-pc-windows-msvc", "universal-apple-darwin"