From 0f952c3d89d018740c432a29b408e93bca455e49 Mon Sep 17 00:00:00 2001 From: miranda Date: Fri, 2 Aug 2024 04:00:12 +0300 Subject: [PATCH] CI: cross fuckery --- .github/workflows/build.yml | 16 ++++++++++------ Cross.toml | 3 +++ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4df20d8..7e761b8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -86,12 +86,16 @@ jobs: # packages: musl-tools musl-dev:${{ matrix.target-apt-arch }} # version: 1.0 - # - name: cache apt packages - # if: startsWith(matrix.os, 'ubuntu') - # uses: awalsh128/cache-apt-pkgs-action@latest - # with: - # packages: libasound2-dev - # version: 1.0 + - name: cache apt packages + if: startsWith(matrix.os, 'ubuntu') + uses: awalsh128/cache-apt-pkgs-action@latest + with: + packages: libasound2-dev + version: 1.0 + + - name: debugprint + run: | + find / -name alsa.pc - name: build uses: houseabsolute/actions-rust-cross@v0 diff --git a/Cross.toml b/Cross.toml index f4e48c7..cddc93a 100644 --- a/Cross.toml +++ b/Cross.toml @@ -6,16 +6,19 @@ pre-build = [ [target.aarch64-unknown-linux-gnu] pre-build = [ + "export PKG_CONFIG_LIBDIR_aarch64_unknown_linux_gnu=/usr/lib/aarch64-unknown-linux-gnu/pkgconfig", "dpkg --add-architecture $CROSS_DEB_ARCH", "apt-get update && apt-get install --assume-yes libasound2-dev:$CROSS_DEB_ARCH" ] [target.x86_64-unknown-linux-musl] pre-build = [ + "export PKG_CONFIG_LIBDIR_x86_64_unknown_linux_musl=/usr/lib/x86_64-unknown-linux-musl/pkgconfig", "apk add alsa-lib-dev" ] [target.aarch64-unknown-linux-musl] pre-build = [ + "export PKG_CONFIG_LIBDIR_aarch64_unknown_linux_musl=/usr/lib/aarch64-unknown-linux-musl/pkgconfig", "apk add alsa-lib-dev" ]