diff --git a/.github/workflows/pr_title.yml b/.github/workflows/pr_title.yml index 1942ae6f6..6af082ed1 100644 --- a/.github/workflows/pr_title.yml +++ b/.github/workflows/pr_title.yml @@ -90,6 +90,11 @@ jobs: exit 0; fi + if echo "$PR_TITLE" | grep -E '^update: update '; then + echo "Exception / OK: Dependabot update pattern" + exit 0; + fi + echo "Installing commitlint-rs. Please wait 30-40 seconds ..." cargo install --quiet commitlint-rs set -e diff --git a/Cargo.lock b/Cargo.lock index d3302233d..9e53a7d2b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -164,6 +164,15 @@ version = "1.0.94" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c1fd03a028ef38ba2276dce7e33fcd6369c158a1bca17946c4b1b701891c1ff7" +[[package]] +name = "arbitrary" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dde20b3d026af13f561bdd0f15edf01fc734f0dafcedbaf42bba506a9517f223" +dependencies = [ + "derive_arbitrary", +] + [[package]] name = "arrayvec" version = "0.7.6" @@ -191,7 +200,7 @@ dependencies = [ "nom", "num-traits", "rusticata-macros", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -206,7 +215,7 @@ dependencies = [ "nom", "num-traits", "rusticata-macros", - "thiserror", + "thiserror 1.0.69", "time", ] @@ -756,7 +765,7 @@ dependencies = [ "sha2", "spki", "tempfile", - "thiserror", + "thiserror 1.0.69", "tokio", "treeline", "ureq", @@ -805,7 +814,7 @@ dependencies = [ "sha1", "sha2", "spki", - "thiserror", + "thiserror 1.0.69", "ureq", "url", "wasm-bindgen", @@ -1265,6 +1274,17 @@ dependencies = [ "serde", ] +[[package]] +name = "derive_arbitrary" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30542c1ad912e0e3d22a1935c290e12e8a29d704a420177a31faad4a601a0800" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.90", +] + [[package]] name = "difflib" version = "0.4.0" @@ -2381,7 +2401,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a32280817bc6e0dbd9aa2abfe52b8fe7405bebc33995649525ecc13ececc3b59" dependencies = [ "nom", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -2673,7 +2693,7 @@ dependencies = [ "num-rational", "serde", "serde_json", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -2988,7 +3008,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "879952a81a83930934cbf1786752d6dedc3b1f29e8f8fb2ad1d0a36f377cf442" dependencies = [ "memchr", - "thiserror", + "thiserror 1.0.69", "ucd-trie", ] @@ -3415,7 +3435,7 @@ checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" dependencies = [ "getrandom", "libredox", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -4193,7 +4213,16 @@ version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" dependencies = [ - "thiserror-impl", + "thiserror-impl 1.0.69", +] + +[[package]] +name = "thiserror" +version = "2.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fec2a1820ebd077e2b90c4df007bebf344cd394098a13c563957d0afc83ea47" +dependencies = [ + "thiserror-impl 2.0.6", ] [[package]] @@ -4207,6 +4236,17 @@ dependencies = [ "syn 2.0.90", ] +[[package]] +name = "thiserror-impl" +version = "2.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d65750cab40f4ff1929fb1ba509e9914eb756131cef4210da8d5d700d26f6312" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.90", +] + [[package]] name = "time" version = "0.3.37" @@ -4892,7 +4932,7 @@ dependencies = [ "ring 0.16.20", "signature", "spki", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -4908,7 +4948,7 @@ dependencies = [ "nom", "oid-registry", "rusticata-macros", - "thiserror", + "thiserror 1.0.69", "time", ] @@ -5028,13 +5068,17 @@ dependencies = [ [[package]] name = "zip" -version = "0.6.6" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261" +checksum = "99d52293fc86ea7cf13971b3bb81eb21683636e7ae24c729cdaf1b7c4157a352" dependencies = [ - "byteorder", + "arbitrary", "crc32fast", "crossbeam-utils", + "displaydoc", + "indexmap 2.7.0", + "memchr", + "thiserror 2.0.6", ] [[package]] diff --git a/make_test_images/Cargo.toml b/make_test_images/Cargo.toml index d1e9599ce..01aefa05d 100644 --- a/make_test_images/Cargo.toml +++ b/make_test_images/Cargo.toml @@ -20,7 +20,7 @@ image = { version = "0.25.2", default-features = false, features = [ "jpeg", "png", ] } -memchr = "2.7.1" +memchr = "2.7.4" nom = "7.1.3" regex = "1.5.6" serde = "1.0.197" diff --git a/sdk/Cargo.toml b/sdk/Cargo.toml index 324ea93e2..a1f1827cc 100644 --- a/sdk/Cargo.toml +++ b/sdk/Cargo.toml @@ -99,7 +99,7 @@ jfifdump = "0.5.1" log = "0.4.8" lopdf = { version = "0.31.0", optional = true } lazy_static = "1.4.0" -memchr = "2.7.1" +memchr = "2.7.4" mp4 = "0.14.0" pem = "3.0.2" png_pong = "0.9.1" @@ -127,7 +127,7 @@ url = "2.5.3" uuid = { version = "1.10.0", features = ["serde", "v4", "js"] } x509-parser = "0.16.0" x509-certificate = "0.21.0" -zip = { version = "0.6.6", default-features = false } +zip = { version = "2.2.1", default-features = false } [target.'cfg(not(target_arch = "wasm32"))'.dependencies] ureq = "2.4.0" diff --git a/sdk/src/builder.rs b/sdk/src/builder.rs index 8ac8aa072..5e84ffdfe 100644 --- a/sdk/src/builder.rs +++ b/sdk/src/builder.rs @@ -24,7 +24,7 @@ use schemars::JsonSchema; use serde::{de::DeserializeOwned, Deserialize, Serialize}; use serde_with::skip_serializing_none; use uuid::Uuid; -use zip::{write::FileOptions, ZipArchive, ZipWriter}; +use zip::{write::SimpleFileOptions, ZipArchive, ZipWriter}; use crate::{ assertion::AssertionDecodeError, @@ -453,7 +453,7 @@ impl Builder { { let mut zip = ZipWriter::new(stream); let options = - FileOptions::default().compression_method(zip::CompressionMethod::Stored); + SimpleFileOptions::default().compression_method(zip::CompressionMethod::Stored); // write a version file zip.start_file("version.txt", options) .map_err(|e| Error::OtherError(Box::new(e)))?;