diff options
| author | Ralf Jung <post@ralfj.de> | 2022-10-02 14:58:17 +0200 |
|---|---|---|
| committer | Ralf Jung <post@ralfj.de> | 2022-10-02 15:05:54 +0200 |
| commit | fc90c480044d70f96df9c9750c680d422bc03e1f (patch) | |
| tree | 4bf1a3447facc8a656d098911295550bca896abf | |
| parent | 1048eba06af174219f7274835fa6f5f3efd3ac78 (diff) | |
| parent | 49532bf1f5184101f84c2cad7ea0c747e90419f7 (diff) | |
| download | rust-fc90c480044d70f96df9c9750c680d422bc03e1f.tar.gz rust-fc90c480044d70f96df9c9750c680d422bc03e1f.zip | |
Auto merge of #2572 - RalfJung:update, r=RalfJung
| -rw-r--r-- | src/tools/miri/.github/workflows/ci.yml | 2 | ||||
| -rw-r--r-- | src/tools/miri/cargo-miri/Cargo.lock | 4 | ||||
| -rw-r--r-- | src/tools/miri/cargo-miri/Cargo.toml | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/tools/miri/.github/workflows/ci.yml b/src/tools/miri/.github/workflows/ci.yml index 4cda24bb189..923f8391366 100644 --- a/src/tools/miri/.github/workflows/ci.yml +++ b/src/tools/miri/.github/workflows/ci.yml @@ -61,7 +61,7 @@ jobs: restore-keys: ${{ runner.os }}-cargo - name: Install rustup-toolchain-install-master - if: ${{ steps.cache.outputs.cache-hit == 'false' }} + if: ${{ steps.cache-npm.outputs.cache-hit != 'true' }} shell: bash run: | cargo install -f rustup-toolchain-install-master diff --git a/src/tools/miri/cargo-miri/Cargo.lock b/src/tools/miri/cargo-miri/Cargo.lock index 763ec45bbfd..f137cafe96a 100644 --- a/src/tools/miri/cargo-miri/Cargo.lock +++ b/src/tools/miri/cargo-miri/Cargo.lock @@ -335,9 +335,9 @@ dependencies = [ [[package]] name = "rustc-build-sysroot" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d7cb0915a85234cee53b853ca8c2538ddfd7f3bf6d2501b52d1d37aba6c7bef" +checksum = "ec5f3689b6c560d6a3a17fcbe54204cd870b4fcf46342d60de16715b660d2c92" dependencies = [ "anyhow", "rustc_version", diff --git a/src/tools/miri/cargo-miri/Cargo.toml b/src/tools/miri/cargo-miri/Cargo.toml index 9cd88ea48cd..b06b590e670 100644 --- a/src/tools/miri/cargo-miri/Cargo.toml +++ b/src/tools/miri/cargo-miri/Cargo.toml @@ -18,7 +18,7 @@ directories = "4" rustc_version = "0.4" serde_json = "1.0.40" cargo_metadata = "0.15.0" -rustc-build-sysroot = "0.3" +rustc-build-sysroot = "0.3.3" # A noop dependency that changes in the Rust repository, it's a bit of a hack. # See the `src/tools/rustc-workspace-hack/README.md` file in `rust-lang/rust` |