zune: Fix CI dependencies

etemesi254 · Oct 21, 2023 · a1843b6 · a1843b6
1 parent fc055eb
commit a1843b6
Show file tree

Hide file tree

Showing 25 changed files with 137 additions and 92 deletions.
diff --git a/.github/workflows/fuzz_deflate.yml b/.github/workflows/fuzz_deflate.yml
@@ -30,8 +30,8 @@ jobs:
     - name: Install
       run: cargo install cargo-fuzz
     - name: Fuzz deflate
-      run: cargo +nightly fuzz run --fuzz-dir zune-inflate/fuzz roundtrip fuzz-corpus/inflate -j2 -- -timeout=10s -max_total_time=120
+      run: cargo +nightly fuzz run --fuzz-dir crates/zune-inflate/fuzz roundtrip fuzz-corpus/inflate -j2 -- -timeout=10s -max_total_time=120
     - name: Fuzz zlib
-      run: cargo +nightly fuzz run --fuzz-dir zune-inflate/fuzz roundtrip_zlib fuzz-corpus/inflate -j2 -- -timeout=10s -max_total_time=120
+      run: cargo +nightly fuzz run --fuzz-dir crates/zune-inflate/fuzz roundtrip_zlib fuzz-corpus/inflate -j2 -- -timeout=10s -max_total_time=120
     - name: Normal Fuzz testing.
-      run: cargo +nightly fuzz run --fuzz-dir zune-inflate/fuzz decode_buffer fuzz-corpus/inflate -j2 -- -timeout=10s -max_total_time=120
+      run: cargo +nightly fuzz run --fuzz-dir crates/zune-inflate/fuzz decode_buffer fuzz-corpus/inflate -j2 -- -timeout=10s -max_total_time=120
diff --git a/.github/workflows/fuzz_hdr.yml b/.github/workflows/fuzz_hdr.yml
@@ -32,5 +32,5 @@ jobs:
         run: cargo install cargo-fuzz
 
       - name: Normal Fuzz testing.
-        run: cargo +nightly fuzz run --fuzz-dir zune-hdr/fuzz decode_buffer -j2 -- -timeout=10s   test-images/hdr -max_total_time=120
+        run: cargo +nightly fuzz run --fuzz-dir crates/zune-hdr/fuzz decode_buffer -j2 -- -timeout=10s   test-images/hdr -max_total_time=120
 
diff --git a/.github/workflows/fuzz_png.yml b/.github/workflows/fuzz_png.yml
@@ -32,4 +32,4 @@ jobs:
         run: cargo install cargo-fuzz
 
       - name: Normal Fuzz testing.
-        run: cargo +nightly fuzz  run  --fuzz-dir zune-png/fuzz decode_buffer  fuzz-corpus/png -j2 -- -timeout=10s -max_total_time=120
+        run: cargo +nightly fuzz  run  --fuzz-dir crates/zune-png/fuzz decode_buffer  fuzz-corpus/png -j2 -- -timeout=10s -max_total_time=120
diff --git a/.github/workflows/fuzz_ppm.yml b/.github/workflows/fuzz_ppm.yml
@@ -32,4 +32,4 @@ jobs:
         run: cargo install cargo-fuzz
 
       - name: Normal Fuzz testing.
-        run: cargo +nightly fuzz run --fuzz-dir zune-ppm/fuzz decode_buffer -j2 -- -timeout=10s -max_total_time=60
+        run: cargo +nightly fuzz run --fuzz-dir crates/zune-ppm/fuzz decode_buffer -j2 -- -timeout=10s -max_total_time=60
diff --git a/.github/workflows/fuzz_psd.yml b/.github/workflows/fuzz_psd.yml
@@ -32,4 +32,4 @@ jobs:
         run: cargo install cargo-fuzz
 
       - name: Normal Fuzz testing.
-        run: cargo +nightly fuzz run --fuzz-dir zune-psd/fuzz decode_buffer test-images/psd -j2 -- -timeout=10s -max_total_time=60
+        run: cargo +nightly fuzz run --fuzz-dir crates/zune-psd/fuzz decode_buffer test-images/psd -j2 -- -timeout=10s -max_total_time=60
diff --git a/.github/workflows/fuzz_qoi.yml b/.github/workflows/fuzz_qoi.yml
@@ -32,4 +32,4 @@ jobs:
         run: cargo install cargo-fuzz
 
       - name: QOI Fuzz testing.
-        run: cargo +nightly fuzz run --fuzz-dir zune-qoi/fuzz decode_buffer test-images/qoi/ -j2 -- -timeout=10s -max_total_time=60
+        run: cargo +nightly fuzz run --fuzz-dir crates/zune-qoi/fuzz decode_buffer test-images/qoi/ -j2 -- -timeout=10s -max_total_time=60
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/benchmarks/Cargo.toml b/benchmarks/Cargo.toml
@@ -7,13 +7,13 @@ edition = "2021"
 
 [dev-dependencies]
 # QOI benchmarks
-zune-qoi = { version = "0.1.0", path = "../crates/zune-qoi" }
+zune-qoi = { path = "../crates/zune-qoi" }
 rapid-qoi = "0.6.1"
 
 # deflate benchmarks
 flate2 = { version = "1.0.25", default-features = false, features = ["zlib-ng-compat"] }
 libdeflater = "1.19.0"
-zune-inflate = { version = "0.2.51", path = "../crates/zune-inflate" }
+zune-inflate = { path = "../crates/zune-inflate" }
 
 # png benchmarks
 png = { version = "0.17.8-rc" }
@@ -24,7 +24,7 @@ zune-png = { path = "../crates/zune-png" }
 # JPEG benchmarks
 mozjpeg = "0.10.5"
 jpeg-decoder = "0.3.0"
-zune-jpeg = { version = "0.3.12", path = "../crates/zune-jpeg" }
+zune-jpeg = {  path = "../crates/zune-jpeg" }
 
 #other format
 zune-image = { path = "../crates/zune-image", features = ["all"] }

diff --git a/crates/zune-bin/Cargo.toml b/crates/zune-bin/Cargo.toml
@@ -8,9 +8,9 @@ edition = "2021"
 
 [dependencies]
 log = "0.4.17"
-zune-image = { version = "0.1.0", path = "../zune-image", features = ["all"] }
-zune-core = { path = "../zune-core", version = "0.2.1" }
-memmap2 = "0.5.7"
+zune-image = { version = "0.4.0", path = "../zune-image", features = ["all"] }
+zune-core = { path = "../zune-core", version = "0.4" }
+memmap2 = "0.9.0"
 serde_json = "1.0.93"
 serde = "1.0.152"
 

diff --git a/crates/zune-bmp/Cargo.toml b/crates/zune-bmp/Cargo.toml
@@ -9,4 +9,4 @@ edition = "2021"
 log = ["zune-core/log"]
 
 [dependencies]
-zune-core = { version = "0.2", path = "../zune-core" }
+zune-core = { version = "0.4", path = "../zune-core" }
diff --git a/crates/zune-farbfeld/Cargo.toml b/crates/zune-farbfeld/Cargo.toml
@@ -14,4 +14,4 @@ license = "MIT OR Apache-2.0 OR Zlib"
 log = ["zune-core/log"]
 
 [dependencies]
-zune-core = { path = "../zune-core", version = "0.2" }
+zune-core = { path = "../zune-core", version = "0.4" }
diff --git a/crates/zune-hdr/Cargo.toml b/crates/zune-hdr/Cargo.toml
@@ -9,4 +9,4 @@ edition = "2021"
 log = ["zune-core/log"]
 
 [dependencies]
-zune-core = { version = "0.2.13", path = "../zune-core", default-features = false }
+zune-core = { version = "0.4.0", path = "../zune-core", default-features = false }
diff --git a/crates/zune-hdr/fuzz/Cargo.lock b/crates/zune-hdr/fuzz/Cargo.lock
diff --git a/crates/zune-image/Cargo.toml b/crates/zune-image/Cargo.toml
@@ -36,7 +36,7 @@ all = ["image_formats", "serde-support", "metadata", "threads", "filters", "simd
 [dependencies]
 zune-imageprocs = { path = "../zune-imageprocs", optional = true }
 # Core primitives
-zune-core = { path = "../zune-core", version = "0.2" }
+zune-core = { path = "../zune-core", version = "0.4" }
 # Images
 zune-png = { path = "../zune-png", optional = true }
 zune-jpeg = { path = "../zune-jpeg", optional = true }

diff --git a/crates/zune-imageprocs/Cargo.toml b/crates/zune-imageprocs/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-zune-core = { path = "../zune-core", version = "0.2" }
+zune-core = { path = "../zune-core", version = "0.4" }
 
 
 [features]

diff --git a/crates/zune-inflate/Cargo.toml b/crates/zune-inflate/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "zune-inflate"
-version = "0.4.0"
+version = "0.2.0"
 edition = "2021"
 description = "A heavily optimized deflate decompressor in Pure Rust"
 exclude = ["tests/"]

diff --git a/crates/zune-jpeg/Cargo.toml b/crates/zune-jpeg/Cargo.toml
@@ -21,7 +21,7 @@ log = ["zune-core/log"]
 default = ["x86", "neon", "std"]
 
 [dependencies]
-zune-core = { path = "../zune-core", version = "0.2" }
+zune-core = { path = "../zune-core", version = "0.4" }
 
 
 [dev-dependencies]

diff --git a/crates/zune-jpegxl/Cargo.toml b/crates/zune-jpegxl/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-zune-core = { version = "0.2.1", path = "../zune-core" }
+zune-core = { version = "0.4", path = "../zune-core" }
 
 [features]
 threads = []

diff --git a/crates/zune-png/Cargo.toml b/crates/zune-png/Cargo.toml
@@ -20,7 +20,7 @@ log = ["zune-core/log"]
 default = ["sse", "std"]
 
 [dependencies]
-zune-core = { path = "../zune-core", version = "0.2" }
+zune-core = { path = "../zune-core", version = "0.4" }
 zune-inflate = { path = "../zune-inflate", version = "0.2", default-features = false, features = ["zlib"] }
 
 [dev-dependencies]