From 81ebbe11de61c940205f29fc82b60102b5721f50 Mon Sep 17 00:00:00 2001 From: mulhern Date: Mon, 23 Oct 2023 15:51:01 -0400 Subject: [PATCH 1/4] Ignore libcryptsetup-rs-sys version for Fedora checks Signed-off-by: mulhern --- .github/workflows/cargo.yml | 6 +++--- .github/workflows/nightly.yml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/cargo.yml b/.github/workflows/cargo.yml index e0019d1f53..94296e26b0 100644 --- a/.github/workflows/cargo.yml +++ b/.github/workflows/cargo.yml @@ -57,6 +57,6 @@ jobs: - name: Run comparisons of version specs with available Fedora packages # yamllint disable rule:line-length run: | - COMPARE_FEDORA_VERSIONS=./ci/dependency_management/compare_fedora_versions FEDORA_RELEASE=rawhide IGNORE_ARGS="--ignore-category low --ignore-high=libcryptsetup-rs" make -f Makefile_dependencies check-fedora-versions - COMPARE_FEDORA_VERSIONS=./ci/dependency_management/compare_fedora_versions FEDORA_RELEASE=f38 IGNORE_ARGS="--ignore-category low --ignore-high=libcryptsetup-rs" make -f Makefile_dependencies check-fedora-versions - COMPARE_FEDORA_VERSIONS=./ci/dependency_management/compare_fedora_versions FEDORA_RELEASE=f37 IGNORE_ARGS="--ignore-category low --ignore-high=libcryptsetup-rs" make -f Makefile_dependencies check-fedora-versions + COMPARE_FEDORA_VERSIONS=./ci/dependency_management/compare_fedora_versions FEDORA_RELEASE=rawhide IGNORE_ARGS="--ignore-category low --ignore-high=libcryptsetup-rs --ignore-high=libcryptsetup-rs-sys" make -f Makefile_dependencies check-fedora-versions + COMPARE_FEDORA_VERSIONS=./ci/dependency_management/compare_fedora_versions FEDORA_RELEASE=f38 IGNORE_ARGS="--ignore-category low --ignore-high=libcryptsetup-rs --ignore-high=libcryptsetup-rs-sys" make -f Makefile_dependencies check-fedora-versions + COMPARE_FEDORA_VERSIONS=./ci/dependency_management/compare_fedora_versions FEDORA_RELEASE=f37 IGNORE_ARGS="--ignore-category low --ignore-high=libcryptsetup-rs --ignore-high=libcryptsetup-rs-sys" make -f Makefile_dependencies check-fedora-versions diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index dca5f95f65..91797b5df6 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -186,9 +186,9 @@ jobs: - name: Run comparisons of version specs with available Fedora packages # yamllint disable rule:line-length run: | - COMPARE_FEDORA_VERSIONS=./ci/dependency_management/compare_fedora_versions FEDORA_RELEASE=rawhide IGNORE_ARGS="--ignore-high=libcryptsetup-rs" make -f Makefile_dependencies check-fedora-versions - COMPARE_FEDORA_VERSIONS=./ci/dependency_management/compare_fedora_versions FEDORA_RELEASE=f38 IGNORE_ARGS="--ignore-high=libcryptsetup-rs" make -f Makefile_dependencies check-fedora-versions - COMPARE_FEDORA_VERSIONS=./ci/dependency_management/compare_fedora_versions FEDORA_RELEASE=f37 IGNORE_ARGS="--ignore-high=libcryptsetup-rs" make -f Makefile_dependencies check-fedora-versions + COMPARE_FEDORA_VERSIONS=./ci/dependency_management/compare_fedora_versions FEDORA_RELEASE=rawhide IGNORE_ARGS="--ignore-high=libcryptsetup-rs --ignore-high=libcryptsetup-rs-sys" make -f Makefile_dependencies check-fedora-versions + COMPARE_FEDORA_VERSIONS=./ci/dependency_management/compare_fedora_versions FEDORA_RELEASE=f38 IGNORE_ARGS="--ignore-high=libcryptsetup-rs --ignore-high=libcryptsetup-rs-sys" make -f Makefile_dependencies check-fedora-versions + COMPARE_FEDORA_VERSIONS=./ci/dependency_management/compare_fedora_versions FEDORA_RELEASE=f37 IGNORE_ARGS="--ignore-high=libcryptsetup-rs --ignore-high=libcryptsetup-rs-sys" make -f Makefile_dependencies check-fedora-versions legacy-cli-checks: continue-on-error: true From 95a7aadb38e96ab243c555435d29d50b3f9fdba2 Mon Sep 17 00:00:00 2001 From: mulhern Date: Mon, 23 Oct 2023 20:14:39 -0400 Subject: [PATCH 2/4] Ignore devicemapper version for Fedora checks Signed-off-by: mulhern --- .github/workflows/cargo.yml | 6 +++--- .github/workflows/nightly.yml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/cargo.yml b/.github/workflows/cargo.yml index 94296e26b0..1a5b4af98a 100644 --- a/.github/workflows/cargo.yml +++ b/.github/workflows/cargo.yml @@ -57,6 +57,6 @@ jobs: - name: Run comparisons of version specs with available Fedora packages # yamllint disable rule:line-length run: | - COMPARE_FEDORA_VERSIONS=./ci/dependency_management/compare_fedora_versions FEDORA_RELEASE=rawhide IGNORE_ARGS="--ignore-category low --ignore-high=libcryptsetup-rs --ignore-high=libcryptsetup-rs-sys" make -f Makefile_dependencies check-fedora-versions - COMPARE_FEDORA_VERSIONS=./ci/dependency_management/compare_fedora_versions FEDORA_RELEASE=f38 IGNORE_ARGS="--ignore-category low --ignore-high=libcryptsetup-rs --ignore-high=libcryptsetup-rs-sys" make -f Makefile_dependencies check-fedora-versions - COMPARE_FEDORA_VERSIONS=./ci/dependency_management/compare_fedora_versions FEDORA_RELEASE=f37 IGNORE_ARGS="--ignore-category low --ignore-high=libcryptsetup-rs --ignore-high=libcryptsetup-rs-sys" make -f Makefile_dependencies check-fedora-versions + COMPARE_FEDORA_VERSIONS=./ci/dependency_management/compare_fedora_versions FEDORA_RELEASE=rawhide IGNORE_ARGS="--ignore-category low --ignore-high=libcryptsetup-rs --ignore-high=libcryptsetup-rs-sys --ignore-high=devicemapper" make -f Makefile_dependencies check-fedora-versions + COMPARE_FEDORA_VERSIONS=./ci/dependency_management/compare_fedora_versions FEDORA_RELEASE=f38 IGNORE_ARGS="--ignore-category low --ignore-high=libcryptsetup-rs --ignore-high=libcryptsetup-rs-sys --ignore-high=devicemapper" make -f Makefile_dependencies check-fedora-versions + COMPARE_FEDORA_VERSIONS=./ci/dependency_management/compare_fedora_versions FEDORA_RELEASE=f37 IGNORE_ARGS="--ignore-category low --ignore-high=libcryptsetup-rs --ignore-high=libcryptsetup-rs-sys --ignore-high=devicemapper" make -f Makefile_dependencies check-fedora-versions diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 91797b5df6..cf67e99d75 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -186,9 +186,9 @@ jobs: - name: Run comparisons of version specs with available Fedora packages # yamllint disable rule:line-length run: | - COMPARE_FEDORA_VERSIONS=./ci/dependency_management/compare_fedora_versions FEDORA_RELEASE=rawhide IGNORE_ARGS="--ignore-high=libcryptsetup-rs --ignore-high=libcryptsetup-rs-sys" make -f Makefile_dependencies check-fedora-versions - COMPARE_FEDORA_VERSIONS=./ci/dependency_management/compare_fedora_versions FEDORA_RELEASE=f38 IGNORE_ARGS="--ignore-high=libcryptsetup-rs --ignore-high=libcryptsetup-rs-sys" make -f Makefile_dependencies check-fedora-versions - COMPARE_FEDORA_VERSIONS=./ci/dependency_management/compare_fedora_versions FEDORA_RELEASE=f37 IGNORE_ARGS="--ignore-high=libcryptsetup-rs --ignore-high=libcryptsetup-rs-sys" make -f Makefile_dependencies check-fedora-versions + COMPARE_FEDORA_VERSIONS=./ci/dependency_management/compare_fedora_versions FEDORA_RELEASE=rawhide IGNORE_ARGS="--ignore-high=libcryptsetup-rs --ignore-high=libcryptsetup-rs-sys --ignore-high=devicemapper" make -f Makefile_dependencies check-fedora-versions + COMPARE_FEDORA_VERSIONS=./ci/dependency_management/compare_fedora_versions FEDORA_RELEASE=f38 IGNORE_ARGS="--ignore-high=libcryptsetup-rs --ignore-high=libcryptsetup-rs-sys --ignore-high=devicemapper" make -f Makefile_dependencies check-fedora-versions + COMPARE_FEDORA_VERSIONS=./ci/dependency_management/compare_fedora_versions FEDORA_RELEASE=f37 IGNORE_ARGS="--ignore-high=libcryptsetup-rs --ignore-high=libcryptsetup-rs-sys --ignore-high=devicemapper" make -f Makefile_dependencies check-fedora-versions legacy-cli-checks: continue-on-error: true From eae41f9d2fb7d4a5e7d9262936b6c20a1ede5337 Mon Sep 17 00:00:00 2001 From: mulhern Date: Mon, 23 Oct 2023 15:37:02 -0400 Subject: [PATCH 3/4] Increase libcryptsetup-rs dependency lower bound to 0.9.1 Increase libcryptsetup-rs-sys dependency lower bound to 0.3.0 Signed-off-by: mulhern --- Cargo.lock | 10 +++++----- Cargo.toml | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6a55315bd8..e818ad7733 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -761,9 +761,9 @@ checksum = "f92be4933c13fd498862a9e02a3055f8a8d9c039ce33db97306fd5a6caa7f29b" [[package]] name = "libcryptsetup-rs" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4aa49f80e29e1e79cca8e448467ba08aaff994ca9c5d5ed410ea87cdf37e741d" +checksum = "73d2aa26d63e5289d6fac1e7e0be2e248ded9b5dfb3e2c345820d060c537d4b6" dependencies = [ "bitflags 2.4.0", "either", @@ -779,11 +779,11 @@ dependencies = [ [[package]] name = "libcryptsetup-rs-sys" -version = "0.2.4" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7c355c283a470a1a09924182b3606999786979697753df3c2206948dcd8f4eb" +checksum = "20fc299fd05078d353a895d940fc463d1008d94258fc8096c095467549324707" dependencies = [ - "bindgen 0.63.0", + "bindgen 0.68.1", "cc", "pkg-config", "semver", diff --git a/Cargo.toml b/Cargo.toml index abf43cd092..ddcd368992 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -133,12 +133,12 @@ version = "0.2.144" optional = true [dependencies.libcryptsetup-rs] -version = "0.9.0" +version = "0.9.1" features = ["mutex"] optional = true [dependencies.libcryptsetup-rs-sys] -version = "0.2.4" +version = "0.3.0" optional = true [dependencies.libmount] From efcd2fd5d4147f1977170d928611e14f2d4dd3d0 Mon Sep 17 00:00:00 2001 From: mulhern Date: Mon, 23 Oct 2023 20:09:54 -0400 Subject: [PATCH 4/4] Increase devicemapper dependency lower bound to 0.34.0 Signed-off-by: mulhern --- Cargo.lock | 44 ++++++++++---------------------------------- Cargo.toml | 2 +- 2 files changed, 11 insertions(+), 35 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e818ad7733..977f00bdff 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -113,26 +113,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" -[[package]] -name = "bindgen" -version = "0.63.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36d860121800b2a9a94f9b5604b332d5cffb234ce17609ea479d723dbc9d3885" -dependencies = [ - "bitflags 1.3.2", - "cexpr", - "clang-sys", - "lazy_static", - "lazycell", - "peeking_take_while", - "proc-macro2", - "quote", - "regex", - "rustc-hash", - "shlex", - "syn 1.0.109", -] - [[package]] name = "bindgen" version = "0.68.1" @@ -365,11 +345,11 @@ dependencies = [ [[package]] name = "devicemapper" -version = "0.33.5" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75a9fd602a98d192f7662a1f4c4cf6920a1b454c3a9e724f6490cf8e30910114" +checksum = "9ff98688149bf6128f259f0009f98eb8ad82584aa0aae143081fdfde513d3d13" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.0", "devicemapper-sys", "env_logger", "lazy_static", @@ -383,12 +363,11 @@ dependencies = [ [[package]] name = "devicemapper-sys" -version = "0.1.5" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0b0f9d16560f830ae6e90b769017333c4561d2c84f39e7aa7d935d2e7bcbc4c" +checksum = "734fba4d2e6b551396439ea7dd4f56980b11bb096bbf505d4a259943b228367b" dependencies = [ - "bindgen 0.63.0", - "nix 0.26.2", + "bindgen", ] [[package]] @@ -749,7 +728,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "163068067b2faf263fb2fc3daff137b45608ee185044ca849dc41438aa38e23a" dependencies = [ - "bindgen 0.68.1", + "bindgen", "cc", ] @@ -783,7 +762,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "20fc299fd05078d353a895d940fc463d1008d94258fc8096c095467549324707" dependencies = [ - "bindgen 0.68.1", + "bindgen", "cc", "pkg-config", "semver", @@ -862,7 +841,7 @@ name = "loopdev" version = "0.4.0" source = "git+https://github.com/mulkieran/loopdev?branch=bump-bindgen-reduce-version-0.68.1#63e6105d5599d9df00041de873d7fc91f53b9f20" dependencies = [ - "bindgen 0.68.1", + "bindgen", "errno 0.2.8", "libc", ] @@ -1161,9 +1140,6 @@ name = "retry" version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ac95c60a949a63fd2822f4964939662d8f2c16c4fa0624fd954bc6e703b9a3f6" -dependencies = [ - "rand", -] [[package]] name = "rustc-hash" @@ -1298,7 +1274,7 @@ dependencies = [ "assert_cmd", "assert_matches", "async-trait", - "bindgen 0.68.1", + "bindgen", "byteorder", "chrono", "clap", diff --git a/Cargo.toml b/Cargo.toml index ddcd368992..14ac23f229 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -89,7 +89,7 @@ version = "2.3.0" optional = true [dependencies.devicemapper] -version = "0.33.5" +version = "0.34.0" optional = true [dependencies.dbus]