From ed039fd32f92e5924e627f323abc9bb3951db2bb Mon Sep 17 00:00:00 2001 From: Nicholas Bishop Date: Mon, 22 Apr 2024 11:41:50 -0400 Subject: [PATCH 1/2] ci: Remove xtask from MSRV build We don't care about the MSRV for xtask, since it's just a dev tool. Also, some of xtask's dependencies (like clap) update MSRV somewhat frequently, so in order to update to the latest version of those deps it's better to not restrict xtask's MSRV. --- .github/workflows/rust.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 5436a4086..5fc22ba11 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -114,7 +114,10 @@ jobs: run: cp .github/workflows/msrv_toolchain.toml rust-toolchain.toml - uses: Swatinem/rust-cache@v2 - name: Build - run: cargo xtask build + # Build uefi-test-runner since its dependency tree includes all the + # library packages. Note that xtask isn't used or built here; since it's + # just a dev tool we don't care about the MSRV for that package. + run: cargo build --target x86_64-unknown-uefi -p uefi-test-runner # This job requires the nightly channel, but keep it as a separate job from # `nightly_channel` because it takes a while to run. build_feature_permutations: From 3c22b948415bd78ada0064e8a7986afa482b18c4 Mon Sep 17 00:00:00 2001 From: Nicholas Bishop Date: Mon, 22 Apr 2024 11:43:24 -0400 Subject: [PATCH 2/2] Update clap dep --- Cargo.lock | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 5a95e50bd..ae0bff778 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -118,9 +118,9 @@ checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" [[package]] name = "clap" -version = "4.4.18" +version = "4.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e578d6ec4194633722ccf9544794b71b1385c3c027efe0c55db226fc880865c" +checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0" dependencies = [ "clap_builder", "clap_derive", @@ -128,9 +128,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.4.18" +version = "4.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4df4df40ec50c46000231c914968278b1eb05098cf8f1b3a518a95030e71d1c7" +checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4" dependencies = [ "anstyle", "clap_lex", @@ -138,11 +138,11 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.4.7" +version = "4.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" +checksum = "528131438037fd55894f62d6e9f068b8f45ac57ffa77517819645d10aed04f64" dependencies = [ - "heck", + "heck 0.5.0", "proc-macro2", "quote", "syn 2.0.60", @@ -150,9 +150,9 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" +checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" [[package]] name = "cpufeatures" @@ -331,6 +331,12 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + [[package]] name = "idna" version = "0.3.0" @@ -1191,7 +1197,7 @@ dependencies = [ "clap", "fatfs", "fs-err", - "heck", + "heck 0.4.1", "itertools", "lzma-rs", "mbrman",