install mingw

milesgranger · Apr 26, 2024 · 03e522f · 03e522f
1 parent cacc0b5
commit 03e522f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/.github/workflows/CI-python.yml b/.github/workflows/CI-python.yml
@@ -173,7 +173,7 @@ jobs:
         env:
           BLOSC2_INSTALL_PREFIX: ${{ github.workspace }}/blosc2
         run: |
-          choco install ninja cmake
+          choco install ninja cmake mingw
           rustup target add i686-pc-windows-gnu
 
           echo "BLOSC2_INSTALL_PREFIX=$Env:BLOSC2_INSTALL_PREFIX" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append
@@ -187,9 +187,6 @@ jobs:
           $Env:LIB += ";$Env:BLOSC2_INSTALL_PREFIX\lib;$Env:BLOSC2_INSTALL_PREFIX\lib64;$Env:BLOSC2_INSTALL_PREFIX\bin"
           echo "LIB=$Env:LIB" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append
 
-          # Now just build blosc2-sys to ensure caching doesn't get in the way and sanity purposes
-          cargo build --release --target ${{ matrix.conf.target-triple }} --package blosc2-sys --target-dir build -vv
-
       - name: Setup (Linux)
         if: runner.os == 'Linux'
         env: 

diff --git a/libcramjam/Cargo.toml b/libcramjam/Cargo.toml
@@ -32,7 +32,7 @@ lz4            = { version = "^1", optional = true }
 flate2         = { version = "^1", optional = true }
 libdeflater    = { version = "^1", optional = true }
 libdeflate-sys = { version = "<1.20.0", optional = true }  # TODO: requires gcc>=4.9 not available on Python's CI wheel builds
-blosc2-rs      = { git = "https://github.com/milesgranger/blosc2-rs.git", optional = true }
+blosc2-rs      = { git = "https://github.com/milesgranger/blosc2-rs.git", optional = true, branch = "only-link-in-sys" }
 zstd           = { version = "^0.13", optional = true }
 xz2            = { version = "0.1.7", features = ["static"], optional = true }