diff --git a/Cargo.lock b/Cargo.lock index 90a3982ad..13e45414a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -225,7 +225,7 @@ dependencies = [ "openssl", "ostree-ext", "regex", - "rustix", + "rustix 1.0.0", "schemars", "serde", "serde_ignored", @@ -255,7 +255,7 @@ dependencies = [ "fn-error-context", "hex", "indoc", - "rustix", + "rustix 1.0.0", "similar-asserts", "tempfile", "thiserror 2.0.12", @@ -272,7 +272,7 @@ dependencies = [ "cap-std-ext", "fn-error-context", "indoc", - "rustix", + "rustix 1.0.0", "similar-asserts", "tempfile", "thiserror 2.0.12", @@ -284,7 +284,7 @@ name = "bootc-utils" version = "0.0.0" dependencies = [ "anyhow", - "rustix", + "rustix 1.0.0", "serde", "serde_json", "shlex", @@ -346,7 +346,7 @@ dependencies = [ "io-lifetimes", "ipnet", "maybe-owned", - "rustix", + "rustix 0.38.44", "windows-sys 0.52.0", "winx", ] @@ -361,7 +361,7 @@ dependencies = [ "cap-primitives", "io-extras", "io-lifetimes", - "rustix", + "rustix 0.38.44", ] [[package]] @@ -373,7 +373,7 @@ dependencies = [ "cap-primitives", "cap-tempfile", "libc", - "rustix", + "rustix 0.38.44", ] [[package]] @@ -385,7 +385,7 @@ dependencies = [ "camino", "cap-std", "rand", - "rustix", + "rustix 0.38.44", "uuid", ] @@ -511,7 +511,7 @@ dependencies = [ "indicatif", "oci-spec", "regex-automata 0.4.9", - "rustix", + "rustix 0.38.44", "sha2", "tar", "tempfile", @@ -544,7 +544,7 @@ dependencies = [ "fn-error-context", "futures-util", "oci-spec", - "rustix", + "rustix 0.38.44", "semver", "serde", "serde_json", @@ -586,7 +586,7 @@ dependencies = [ "bitflags 2.6.0", "crossterm_winapi", "parking_lot", - "rustix", + "rustix 0.38.44", "winapi", ] @@ -781,9 +781,9 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.35" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c936bfdafb507ebbf50b8074c54fa31c5be9a1e7e5f467dd659697041407d07c" +checksum = "11faaf5a5236997af9848be0bef4db95824b1d534ebc64d0f0c6cf3e67bd38dc" dependencies = [ "crc32fast", "libz-sys", @@ -829,7 +829,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "033b337d725b97690d86893f9de22b67b80dcc4e9ad815f348254c38119db8fb" dependencies = [ "io-lifetimes", - "rustix", + "rustix 0.38.44", "windows-sys 0.52.0", ] @@ -929,7 +929,19 @@ checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", "libc", - "wasi", + "wasi 0.11.0+wasi-snapshot-preview1", +] + +[[package]] +name = "getrandom" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43a49c392881ce6d5c3b8cb70f98717b7c07aabbdff06687b9030dbfbe2725f8" +dependencies = [ + "cfg-if", + "libc", + "wasi 0.13.3+wasi-0.2.2", + "windows-targets", ] [[package]] @@ -1119,9 +1131,9 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" [[package]] name = "indexmap" -version = "2.6.0" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da" +checksum = "8c9c992b02b5b4c94ea26e32fe5bccb7aa7d9f390ab5c1221ff895bc7ea8b652" dependencies = [ "equivalent", "hashbrown", @@ -1299,6 +1311,12 @@ version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" +[[package]] +name = "linux-raw-sys" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6db9c683daf087dc577b7506e9695b3d556a9f3849903fa28186283afd6809e9" + [[package]] name = "lock_api" version = "0.4.12" @@ -1317,9 +1335,9 @@ checksum = "30bde2b3dc3671ae49d8e2e9f044c7c005836e7a023ee57cffa25ab82764bb9e" [[package]] name = "mandown" -version = "0.1.5" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18e38db303e5a32f72f578edbc0d69b0f6e9549b27116f1df4f23cf09b772c8f" +checksum = "4fdbfffcc76077732ff6a365314d396b7e3e43681b6d8f59e516851fa47494ab" dependencies = [ "deunicode", "pulldown-cmark", @@ -1373,9 +1391,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.8.0" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" +checksum = "8e3e04debbb59698c15bacbb6d93584a8c0ca9cc3213cb423d31f760d8843ce5" dependencies = [ "adler2", ] @@ -1388,7 +1406,7 @@ checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" dependencies = [ "hermit-abi", "libc", - "wasi", + "wasi 0.11.0+wasi-snapshot-preview1", "windows-sys 0.52.0", ] @@ -1602,7 +1620,7 @@ dependencies = [ "pin-project", "quickcheck", "regex", - "rustix", + "rustix 1.0.0", "serde", "serde_json", "similar-asserts", @@ -1753,9 +1771,9 @@ dependencies = [ [[package]] name = "pulldown-cmark" -version = "0.12.2" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f86ba2052aebccc42cbbb3ed234b8b13ce76f75c3551a303cb2bcffcff12bb14" +checksum = "1e8bbe1a966bd2f362681a44f6edce3c2310ac21e4d5067a6e7ec396297a6ea0" dependencies = [ "bitflags 2.6.0", "getopts", @@ -1817,7 +1835,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom", + "getrandom 0.2.15", ] [[package]] @@ -1915,11 +1933,24 @@ dependencies = [ "errno", "itoa", "libc", - "linux-raw-sys", + "linux-raw-sys 0.4.14", "once_cell", "windows-sys 0.59.0", ] +[[package]] +name = "rustix" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17f8dcd64f141950290e45c99f7710ede1b600297c91818bb30b3667c0f45dc0" +dependencies = [ + "bitflags 2.6.0", + "errno", + "libc", + "linux-raw-sys 0.9.2", + "windows-sys 0.59.0", +] + [[package]] name = "rustversion" version = "1.0.18" @@ -2096,9 +2127,9 @@ dependencies = [ [[package]] name = "similar-asserts" -version = "1.6.1" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f08357795f0d604ea7d7130f22c74b03838c959bdb14adde3142aab4d18a293" +checksum = "b5b441962c817e33508847a22bd82f03a30cff43642dc2fae8b050566121eb9a" dependencies = [ "console", "similar", @@ -2212,7 +2243,7 @@ dependencies = [ "indoc", "log", "openssh-keys", - "rustix", + "rustix 1.0.0", "serde", "serde_json", "serde_yaml", @@ -2248,7 +2279,7 @@ dependencies = [ "cfg-if", "fastrand", "once_cell", - "rustix", + "rustix 0.38.44", "windows-sys 0.59.0", ] @@ -2264,7 +2295,7 @@ dependencies = [ "indoc", "libtest-mimic", "oci-spec", - "rustix", + "rustix 1.0.0", "serde", "serde_json", "tempfile", @@ -2549,11 +2580,11 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "uuid" -version = "1.11.1" +version = "1.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b913a3b5fe84142e269d63cc62b64319ccaf89b748fc31fe025177f767a756c4" +checksum = "e0f540e3240398cce6128b64ba83fdbdd86129c16a3aa1a3a252efd66eb3d587" dependencies = [ - "getrandom", + "getrandom 0.3.1", "serde", ] @@ -2597,6 +2628,15 @@ version = "0.11.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" +[[package]] +name = "wasi" +version = "0.13.3+wasi-0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26816d2e1a4a36a2940b96c5296ce403917633dff8f3440e9b236ed6f6bacad2" +dependencies = [ + "wit-bindgen-rt", +] + [[package]] name = "wasm-bindgen" version = "0.2.95" @@ -2670,7 +2710,7 @@ checksum = "2774c861e1f072b3aadc02f8ba886c26ad6321567ecc294c935434cad06f1283" dependencies = [ "either", "env_home", - "rustix", + "rustix 0.38.44", "winsafe", ] @@ -2818,6 +2858,15 @@ dependencies = [ "windows-sys 0.52.0", ] +[[package]] +name = "wit-bindgen-rt" +version = "0.33.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3268f3d866458b787f390cf61f4bbb563b922d091359f9608842999eaee3943c" +dependencies = [ + "bitflags 2.6.0", +] + [[package]] name = "xattr" version = "1.3.1" @@ -2825,8 +2874,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" dependencies = [ "libc", - "linux-raw-sys", - "rustix", + "linux-raw-sys 0.4.14", + "rustix 0.38.44", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 2e7f3349e..86da6a6ee 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -54,7 +54,7 @@ indicatif = "0.17.0" fn-error-context = "0.2.1" libc = "0.2.154" openssl = "0.10.33" -rustix = { "version" = "0.38.34", features = ["thread", "fs", "system", "process", "mount"] } +rustix = { "version" = "1.0.0", features = ["thread", "fs", "system", "process", "mount"] } serde = "1.0.199" serde_json = "1.0.116" similar-asserts = "1.5.0" diff --git a/blockdev/Cargo.toml b/blockdev/Cargo.toml index 43e41e049..0a4711354 100644 --- a/blockdev/Cargo.toml +++ b/blockdev/Cargo.toml @@ -19,7 +19,7 @@ serde_json = { workspace = true } tracing = { workspace = true } [dev-dependencies] -indoc = "2.0.5" +indoc = "=2.0.5" [lib] path = "src/blockdev.rs" \ No newline at end of file diff --git a/ostree-ext/.github/workflows/rust.yml b/ostree-ext/.github/workflows/rust.yml index 91c971ea0..c529c299a 100644 --- a/ostree-ext/.github/workflows/rust.yml +++ b/ostree-ext/.github/workflows/rust.yml @@ -21,7 +21,7 @@ jobs: runs-on: ubuntu-latest container: quay.io/coreos-assembler/fcos-buildroot:testing-devel steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Code lints run: ./ci/lints.sh - name: Install deps @@ -47,7 +47,7 @@ jobs: runs-on: ubuntu-latest container: quay.io/coreos-assembler/fcos-buildroot:testing-devel steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Install deps run: ./ci/installdeps.sh - name: Cache Dependencies @@ -67,7 +67,7 @@ jobs: container: quay.io/coreos-assembler/fcos-buildroot:testing-devel steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Install deps run: ./ci/installdeps.sh - name: Detect crate MSRV @@ -91,8 +91,8 @@ jobs: cargo-deny: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - uses: EmbarkStudios/cargo-deny-action@v1 + - uses: actions/checkout@v4 + - uses: EmbarkStudios/cargo-deny-action@v2 with: log-level: warn command: check bans sources licenses @@ -103,7 +103,7 @@ jobs: container: quay.io/fedora/fedora-coreos:testing-devel steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Download ostree-ext-cli uses: actions/download-artifact@v4.1.8 with: @@ -119,7 +119,7 @@ jobs: container: quay.io/fedora/fedora-coreos:testing-devel steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Download ostree-ext-cli uses: actions/download-artifact@v4.1.8 with: @@ -133,7 +133,7 @@ jobs: needs: build runs-on: ubuntu-latest container: - image: quay.io/fedora/fedora-bootc:41 + image: quay.io/fedora/fedora-bootc:43 options: "--privileged --pid=host -v /var/tmp:/var/tmp -v /run/dbus:/run/dbus -v /run/systemd:/run/systemd -v /:/run/host" steps: - name: Checkout repository @@ -152,9 +152,9 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Checkout coreos-layering-examples - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: repository: coreos/coreos-layering-examples path: coreos-layering-examples diff --git a/ostree-ext/Cargo.toml b/ostree-ext/Cargo.toml index d2e3be5df..e4e4f91ef 100644 --- a/ostree-ext/Cargo.toml +++ b/ostree-ext/Cargo.toml @@ -57,7 +57,7 @@ xshell = { version = "0.2", optional = true } similar-asserts = { version = "1.5.0", optional = true } [dev-dependencies] -quickcheck = "1" +quickcheck = "=1.0.3" # https://github.com/rust-lang/cargo/issues/2911 # https://github.com/rust-lang/rfcs/pull/1956 ostree-ext = { path = ".", features = ["internal-testing-api"] } diff --git a/xtask/Cargo.toml b/xtask/Cargo.toml index d1c451d2a..008cbb343 100644 --- a/xtask/Cargo.toml +++ b/xtask/Cargo.toml @@ -19,7 +19,7 @@ fn-error-context = { workspace = true } tar = "0.4" toml = "0.8" tempfile = { workspace = true } -mandown = "0.1.3" +mandown = "1.0.0" xshell = { version = "0.2.6" } [lints]