Use updated libcramjam and CI

milesgranger · Sep 23, 2024 · e24d1b8 · e24d1b8
1 parent fae7b1f
commit e24d1b8
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -91,9 +91,17 @@ jobs:
       - name: Setup (Mac)
         if: runner.os == 'macOS'
         run: |
-          brew install ninja
+          brew install ninja automake autoconf coreutils libtool nasm
           echo "MACOSX_DEPLOYMENT_TARGET=10.12" >> $GITHUB_ENV
 
+      - name: Install nasm (Windows / Linux)
+        if: runner.os != 'macOS'
+        uses: ilammy/setup-nasm@v1
+
+      - name: Set MSVC developer prompt
+        if: runner.os == 'Windows'
+        uses: ilammy/msvc-dev-cmd@v1.6.0
+
       - name: Setup (Windows)
         if: runner.os == 'Windows'
         run: |

diff --git a/Cargo.toml b/Cargo.toml
@@ -48,9 +48,7 @@ wasm32-compat            = ["libcramjam/wasm32-compat"]
 
 [dependencies]
 pyo3 = { version = "^0.22", default-features = false, features = ["macros"] }
-# libcramjam = { version = "0.4.6", default-features = false }
-libcramjam = { path = "../libcramjam", default-features = false }
-# libcramjam = { git = "https://github.com/cramjam/libcramjam.git", branch = "add-igzip" }
+libcramjam = { version = "0.5.0", default-features = false }
 
 [build-dependencies]
 pyo3-build-config = "^0.22"