From 9923788f07e44869f7b5a49bee68650bef0a8d01 Mon Sep 17 00:00:00 2001 From: Jiahao XU Date: Fri, 17 Feb 2023 22:07:24 +1100 Subject: [PATCH] Fix CI: Only turn on feature pkg-config on linux and fix cross compilation (#815) Signed-off-by: Jiahao XU --- .github/workflows/ci.yml | 3 ++- justfile | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d36af8bc..3a510540 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -38,13 +38,14 @@ jobs: os: ubuntu-latest - target: x86_64-unknown-linux-musl os: ubuntu-latest + c: true - target: x86_64-pc-windows-msvc os: windows-latest runs-on: ${{ matrix.os }} env: CARGO_BUILD_TARGET: ${{ matrix.target }} - CARGO_BINSTALL_LOG_LEVEL: debug + JUST_USE_CARGO_ZIGBUILD: ${{ matrix.c }} steps: - uses: actions/checkout@v3 diff --git a/justfile b/justfile index bc95db81..543d0251 100644 --- a/justfile +++ b/justfile @@ -63,7 +63,7 @@ cargo-no-default-features := if default-features == "false" { " --no-default-fea } else { "" } support-pkg-config := if target == target-host { - if target-os != "windows" { "true" } else { "" } + if target-os == "linux" { "true" } else { "" } } else { "" } cargo-features := trim_end_match(if override-features != "" { override-features