From 78e2b25d51ab17463aca7751bf4c329a5a480a3b Mon Sep 17 00:00:00 2001 From: Miles Granger Date: Tue, 24 Sep 2024 12:13:53 +0200 Subject: [PATCH] Try installing pre-built cross v0.2.5 --- .github/workflows/CI.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index ac5c2f2d..6cf65592 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -116,20 +116,18 @@ jobs: ISAL_INSTALL_PREFIX: ${{ github.workspace }}/isal run: | sudo apt update - sudo apt install ninja-build -y + sudo apt install ninja-build wget -y echo "BLOSC2_INSTALL_PREFIX=$BLOSC2_INSTALL_PREFIX" >> $GITHUB_ENV echo "ISAL_INSTALL_PREFIX=$ISAL_INSTALL_PREFIX" >> $GITHUB_ENV echo "LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$BLOSC2_INSTALL_PREFIX/lib:$BLOSC2_INSTALL_PREFIX/lib64:$ISAL_INSTALL_PREFIX/lib:$ISAL_INSTALL_PREFIX/lib64" >> $GITHUB_ENV - # maturin action fails building blosc2 for armv7 and aarch64 - # so we'll just use 'cross' to build and pass it in for the action for all archs - # nothing special for the revision pin, just deterministic install - cargo install cross --git https://github.com/cross-rs/cross --rev 6d097fb + wget https://github.com/cross-rs/cross/releases/download/v0.2.5/cross-x86_64-unknown-linux-gnu.tar.gz -O cross.tar.gz + tar -xvzf cross.tar.gz # Build blosc2 - cross build --release --target $TARGET_TRIPLE --package blosc2-sys --target-dir build + ./cross build --release --target $TARGET_TRIPLE --package blosc2-sys --target-dir build blosc2_sys_dir=$(ls build/$TARGET_TRIPLE/release/build/ | grep blosc2-sys) mv $WORKSPACE/build/$TARGET_TRIPLE/release/build/$blosc2_sys_dir/out $BLOSC2_INSTALL_PREFIX tree -L 2 $BLOSC2_INSTALL_PREFIX