From 76331a78f9b4e00e70ef0328f0c3ab4c57aee747 Mon Sep 17 00:00:00 2001 From: fan xia Date: Sun, 1 Oct 2023 01:19:03 +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 | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index af94209..c33dd19 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -45,14 +45,14 @@ jobs: docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-debian build: |- sudo apt-get update && - sudo apt-get install pkg-config libglib2.0-dev libgtk-3-dev gcc-arm-linux-gnueabihf libgtk2.0-dev libpango1.0-dev libcairo2-dev libfontconfig1-dev -y && + sudo apt-get install 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 - host: ubuntu-latest target: x86_64-unknown-linux-musl docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-alpine - build: apk update && apk add pkgconfig glib-dev gtk+3.0-dev pango-dev cairo fontconfig && set -e && pnpm build && strip *.node + build: apk update && apk add libc-dev pkgconfig glib-dev gtk+3.0-dev pango-dev cairo fontconfig && set -e && pnpm build && strip *.node - host: macos-latest target: aarch64-apple-darwin build: | @@ -63,34 +63,32 @@ jobs: docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-debian-aarch64 build: |- sudo apt-get update && - sudo apt-get install pkg-config libglib2.0-dev libgtk-3-dev gcc-arm-linux-gnueabihf libgtk2.0-dev libpango1.0-dev libcairo2-dev libfontconfig1-dev -y && + sudo apt-get install 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 aarch64-unknown-linux-gnu && + PKG_CONFIG_SYSROOT_DIR=/ pnpm build --target aarch64-unknown-linux-gnu && aarch64-unknown-linux-gnu-strip *.node - host: ubuntu-latest target: armv7-unknown-linux-gnueabihf setup: | sudo apt-get update - sudo apt-get install pkg-config libglib2.0-dev libgtk-3-dev gcc-arm-linux-gnueabihf libgtk2.0-dev libpango1.0-dev libcairo2-dev libfontconfig1-dev -y + sudo apt-get install 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: | - pnpm build --target armv7-unknown-linux-gnueabihf + PKG_CONFIG_SYSROOT_DIR=/ pnpm build --target armv7-unknown-linux-gnueabihf arm-linux-gnueabihf-strip *.node - host: ubuntu-latest target: aarch64-unknown-linux-musl docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-alpine build: |- - apk update && apk add pkgconfig glib-dev gtk+3.0-dev pango-dev cairo fontconfig && + apk update && apk add libc-dev pkgconfig glib-dev gtk+3.0-dev pango-dev cairo fontconfig && set -e && rustup target add aarch64-unknown-linux-musl && - pnpm build --target 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 - host: windows-latest target: aarch64-pc-windows-msvc build: pnpm build --target aarch64-pc-windows-msvc name: stable - ${{ matrix.settings.target }} - node@18 runs-on: ${{ matrix.settings.host }} - # env: - # PKG_CONFIG_SYSROOT_DIR: / steps: - uses: actions/checkout@v3 - uses: pnpm/action-setup@v2