.github/workflows/buildjet.yml

@@ -19,7 +19,7 @@ jobs:
       CARGO_TERM_COLOR: always
 
     steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
         with:
           persist-credentials: false
 

.github/workflows/check-dist.yml

@@ -18,12 +18,12 @@ jobs:
     if: github.repository == 'Swatinem/rust-cache'
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
         with:
           persist-credentials: false
 
       - name: Setup Node.js 20.x
-        uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
+        uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
         with:
           node-version: 20.x
           cache: npm
@@ -43,7 +43,7 @@ jobs:
           fi
         id: diff
 
-      - uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
+      - uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
         if: ${{ failure() && steps.diff.conclusion == 'failure' }}
         with:
           name: dist

.github/workflows/coverage.yml

@@ -19,13 +19,13 @@ jobs:
       CARGO_TERM_COLOR: always
 
     steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
         with:
           persist-credentials: false
 
       - run: rustup toolchain install stable --profile minimal --component llvm-tools-preview --no-self-update
 
-      - uses: taiki-e/install-action@d850aa816998e5cf15f67a78c7b933f2a5033f8a # v2.63.3
+      - uses: taiki-e/install-action@763e3324d4fd026c9bd284c504378585777a87d5 # v2.62.57
         with:
           tool: cargo-llvm-cov
 

.github/workflows/dependabot.yml

@@ -18,7 +18,7 @@ jobs:
         uses: dependabot/fetch-metadata@08eff52bf64351f401fb50d4972fa95b9f2c2d1b # v2.4.0
         with:
           github-token: "${{ secrets.GITHUB_TOKEN }}"
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
         with:
           fetch-depth: 2
           persist-credentials: false
@@ -37,7 +37,7 @@ jobs:
           fi
       - name: Setup node if necessary
         if: steps.npm.outputs.changed != ''
-        uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
+        uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
         with:
           node-version: 20.x
           cache: npm

.github/workflows/git-registry.yml

@@ -20,7 +20,7 @@ jobs:
       CARGO_REGISTRIES_CRATES_IO_PROTOCOL: git
 
     steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
         with:
           persist-credentials: false
 

.github/workflows/install.yml

@@ -19,7 +19,7 @@ jobs:
       CARGO_TERM_COLOR: always
 
     steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
         with:
           persist-credentials: false
 

.github/workflows/multi-job-cache.yml

@@ -20,7 +20,7 @@ jobs:
 
     steps:
       - name: checkout
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
         with:
           persist-credentials: false
 
@@ -54,7 +54,7 @@ jobs:
 
     steps:
       - name: checkout
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
         with:
           persist-credentials: false
 

.github/workflows/nix.yml

@@ -1,33 +0,0 @@
-name: nix
-
-on: [push, pull_request]
-
-permissions: {}
-
-jobs:
-  nix:
-    if: github.repository == 'Swatinem/rust-cache'
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ubuntu-latest, macos-latest]
-
-    name: Test Nix on ${{ matrix.os }}
-    runs-on: ${{ matrix.os }}
-
-    steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
-        with:
-          persist-credentials: false
-
-      - uses: cachix/install-nix-action@4e002c8ec80594ecd40e759629461e26c8abed15 # v31.9.0
-
-      - uses: ./
-        with:
-          workspaces: tests
-          cmd-format: nix develop ./tests -c {0}
-
-      - run: |
-          nix develop -c cargo check
-          nix develop -c cargo test
-        working-directory: tests

.github/workflows/simple.yml

@@ -19,7 +19,7 @@ jobs:
       CARGO_TERM_COLOR: always
 
     steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
         with:
           persist-credentials: false
 

.github/workflows/target-dir.yml

@@ -19,7 +19,7 @@ jobs:
       CARGO_TERM_COLOR: always
 
     steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
         with:
           persist-credentials: false
 

.github/workflows/workspaces.yml

@@ -19,7 +19,7 @@ jobs:
       CARGO_TERM_COLOR: always
 
     steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
         with:
           persist-credentials: false
 

.github/workflows/zizmor.yml

@@ -16,7 +16,7 @@ jobs:
       security-events: write # for uploading results to the Security tab
     steps:
       - name: Checkout repository
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
         with:
           persist-credentials: false
 

README.md

@@ -99,16 +99,6 @@ sensible defaults.
     # Determines whether to cache the ~/.cargo/bin directory.
     # default: "true"
     cache-bin: ""
-
-    # A format string used to format commands to be run, i.e. `rustc` and `cargo`.
-    # Must contain exactly one occurance of `{0}`, which is the formatting fragment
-    # that will be replaced with the `rustc` or `cargo` command. This is necessary
-    # when using Nix or other setup that requires running these commands within a
-    # specific shell, otherwise the system `rustc` and `cargo` will be run.
-    # default: "{0}"
-    cmd-format: ""
-    # To run within a Nix shell (using the default dev shell of a flake in the repo root):
-    cmd-format: nix develop -c {0}
 ```
 
 Further examples are available in the [.github/workflows](./.github/workflows/) directory.
@@ -143,8 +133,7 @@ This cache is automatically keyed by:
 
 - the github [`job_id`](https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_id)
 (if `add-job-id-key` is `"true"`),
-- the rustc release / host / hash (for all installed toolchains when
-  available),
+- the rustc release / host / hash,
 - the following values, if `add-rust-environment-hash-key` is `"true"`:
   - the value of some compiler-specific environment variables (eg. RUSTFLAGS, etc), and
   - a hash of all `Cargo.lock` / `Cargo.toml` files found anywhere in the repository (if present).

action.yml

@@ -60,10 +60,6 @@ inputs:
     description: "Check if a cache entry exists without downloading the cache"
     required: false
     default: "false"
-  cmd-format:
-    description: "A format string used to format commands to be run, i.e. `rustc` and `cargo`."
-    required: false
-    default: "{0}"
 outputs:
   cache-hit:
     description: "A boolean value that indicates an exact match was found."

dist/restore/index.js

@@ -149504,8 +149504,6 @@ var external_crypto_default = /*#__PURE__*/__nccwpck_require__.n(external_crypto
 // EXTERNAL MODULE: external "fs/promises"
 var promises_ = __nccwpck_require__(91943);
 var promises_default = /*#__PURE__*/__nccwpck_require__.n(promises_);
-;// CONCATENATED MODULE: external "stream/promises"
-const external_stream_promises_namespaceObject = require("stream/promises");
 // EXTERNAL MODULE: external "os"
 var external_os_ = __nccwpck_require__(70857);
 var external_os_default = /*#__PURE__*/__nccwpck_require__.n(external_os_);
@@ -150677,12 +150675,11 @@ function reportError(e) {
         lib_core.error(`${e.stack}`);
     }
 }
-async function getCmdOutput(cmdFormat, cmd, options = {}) {
-    cmd = cmdFormat.replace("{0}", cmd);
+async function getCmdOutput(cmd, args = [], options = {}) {
     let stdout = "";
     let stderr = "";
     try {
-        await exec.exec(cmd, [], {
+        await exec.exec(cmd, args, {
             silent: true,
             listeners: {
                 stdout(data) {
@@ -150697,7 +150694,7 @@ async function getCmdOutput(cmdFormat, cmd, options = {}) {
     }
     catch (e) {
         e.commandFailed = {
-            command: cmd,
+            command: `${cmd} ${args.join(" ")}`,
             stderr,
         };
         throw e;
@@ -150745,12 +150742,11 @@ class Workspace {
         this.root = root;
         this.target = target;
     }
-    async getPackages(cmdFormat, filter, extraArgs) {
-        const cmd = "cargo metadata --all-features --format-version 1" + (extraArgs ? ` ${extraArgs}` : "");
+    async getPackages(filter, ...extraArgs) {
         let packages = [];
         try {
             lib_core.debug(`collecting metadata for "${this.root}"`);
-            const meta = JSON.parse(await getCmdOutput(cmdFormat, cmd, {
+            const meta = JSON.parse(await getCmdOutput("cargo", ["metadata", "--all-features", "--format-version", "1", ...extraArgs], {
                 cwd: this.root,
                 env: { ...process.env, "CARGO_ENCODED_RUSTFLAGS": "" },
             }));
@@ -150765,11 +150761,11 @@ class Workspace {
         }
         return packages;
     }
-    async getPackagesOutsideWorkspaceRoot(cmdFormat) {
-        return await this.getPackages(cmdFormat, (pkg) => !pkg.manifest_path.startsWith(this.root));
+    async getPackagesOutsideWorkspaceRoot() {
+        return await this.getPackages((pkg) => !pkg.manifest_path.startsWith(this.root));
     }
-    async getWorkspaceMembers(cmdFormat) {
-        return await this.getPackages(cmdFormat, (_) => true, "--no-deps");
+    async getWorkspaceMembers() {
+        return await this.getPackages((_) => true, "--no-deps");
     }
 }
 
@@ -150785,15 +150781,12 @@ class Workspace {
 
 
 
-
 const HOME = external_os_default().homedir();
 const config_CARGO_HOME = process.env.CARGO_HOME || external_path_default().join(HOME, ".cargo");
 const STATE_CONFIG = "RUST_CACHE_CONFIG";
 const HASH_LENGTH = 8;
 class CacheConfig {
     constructor() {
-        /** A format string for running commands */
-        this.cmdFormat = "";
         /** All the paths we want to cache */
         this.cachePaths = [];
         /** The primary cache key */
@@ -150809,7 +150802,7 @@ class CacheConfig {
         /** The prefix portion of the cache key */
         this.keyPrefix = "";
         /** The rust version considered for the cache key */
-        this.keyRust = [];
+        this.keyRust = "";
         /** The environment variables considered for the cache key */
         this.keyEnvs = [];
         /** The files considered for the cache key */
@@ -150822,17 +150815,6 @@ class CacheConfig {
      */
     static async new() {
         const self = new CacheConfig();
-        let cmdFormat = lib_core.getInput("cmd-format");
-        if (cmdFormat) {
-            const placeholderMatches = cmdFormat.match(/\{0\}/g);
-            if (!placeholderMatches || placeholderMatches.length !== 1) {
-                cmdFormat = "{0}";
-            }
-        }
-        else {
-            cmdFormat = "{0}";
-        }
-        self.cmdFormat = cmdFormat;
         // Construct key prefix:
         // This uses either the `shared-key` input,
         // or the `key` input combined with the `job` key.
@@ -150863,15 +150845,12 @@ class CacheConfig {
         // The env vars are sorted, matched by prefix and hashed into the
         // resulting environment hash.
         let hasher = external_crypto_default().createHash("sha1");
-        const rustVersions = Array.from(await getRustVersions(cmdFormat));
-        // Doesn't matter how they're sorted, just as long as it's deterministic.
-        rustVersions.sort();
-        for (const rustVersion of rustVersions) {
-            const { release, host, "commit-hash": commitHash } = rustVersion;
-            const keyRust = `${release} ${host} ${commitHash}`;
+        const rustVersion = await getRustVersion();
+        let keyRust = `${rustVersion.release} ${rustVersion.host}`;
         hasher.update(keyRust);
-            self.keyRust.push(keyRust);
-        }
+        hasher.update(rustVersion["commit-hash"]);
+        keyRust += ` (${rustVersion["commit-hash"]})`;
+        self.keyRust = keyRust;
         // these prefixes should cover most of the compiler / rust / cargo keys
         const envPrefixes = ["CARGO", "CC", "CFLAGS", "CXX", "CMAKE", "RUST"];
         envPrefixes.push(...lib_core.getInput("env-vars").split(/\s+/).filter(Boolean));
@@ -150916,7 +150895,7 @@ class CacheConfig {
             for (const workspace of workspaces) {
                 const root = workspace.root;
                 keyFiles.push(...(await globFiles(`${root}/**/.cargo/config.toml\n${root}/**/rust-toolchain\n${root}/**/rust-toolchain.toml`)));
-                const workspaceMembers = await workspace.getWorkspaceMembers(cmdFormat);
+                const workspaceMembers = await workspace.getWorkspaceMembers();
                 const cargo_manifests = sort_and_uniq(workspaceMembers.map((member) => external_path_default().join(member.path, "Cargo.toml")));
                 for (const cargo_manifest of cargo_manifests) {
                     try {
@@ -150986,7 +150965,9 @@ class CacheConfig {
             }
             keyFiles = sort_and_uniq(keyFiles);
             for (const file of keyFiles) {
-                await (0,external_stream_promises_namespaceObject.pipeline)((0,external_fs_.createReadStream)(file), hasher);
+                for await (const chunk of external_fs_default().createReadStream(file)) {
+                    hasher.update(chunk);
+                }
             }
             keyFiles.push(...parsedKeyFiles);
             self.keyFiles = sort_and_uniq(keyFiles);
@@ -151055,10 +151036,7 @@ class CacheConfig {
         lib_core.info(`.. Prefix:`);
         lib_core.info(`  - ${this.keyPrefix}`);
         lib_core.info(`.. Environment considered:`);
-        lib_core.info(`  - Rust Versions:`);
-        for (const rust of this.keyRust) {
-            lib_core.info(`    - ${rust}`);
-        }
+        lib_core.info(`  - Rust Version: ${this.keyRust}`);
         for (const env of this.keyEnvs) {
             lib_core.info(`  - ${env}`);
         }
@@ -151093,31 +151071,9 @@ function isCacheUpToDate() {
 function digest(hasher) {
     return hasher.digest("hex").substring(0, HASH_LENGTH);
 }
-async function getRustVersions(cmdFormat) {
-    const versions = new Set();
-    versions.add(parseRustVersion(await getCmdOutput(cmdFormat, "rustc -vV")));
-    const stdout = await (async () => {
-        try {
-            return await getCmdOutput(cmdFormat, "rustup toolchain list --quiet");
-        }
-        catch (e) {
-            lib_core.warning(`Error running rustup toolchain list, falling back to default toolchain only: ${e}`);
-            return undefined;
-        }
-    })();
-    if (stdout !== undefined) {
-        for (const toolchain of stdout.split(/[\n\r]+/)) {
-            const trimmed = toolchain.trim();
-            if (!trimmed) {
-                continue;
-            }
-            versions.add(parseRustVersion(await getCmdOutput(cmdFormat, `rustup run ${toolchain} rustc -vV`)));
-        }
-    }
-    return versions;
-}
-function parseRustVersion(stdout) {
-    const splits = stdout
+async function getRustVersion() {
+    const stdout = await getCmdOutput("rustc", ["-vV"]);
+    let splits = stdout
         .split(/[\n\r]+/)
         .filter(Boolean)
         .map((s) => s.split(":").map((s) => s.trim()))
@@ -151128,17 +151084,10 @@ async function globFiles(pattern) {
     const globber = await glob.create(pattern, {
         followSymbolicLinks: false,
     });
-    // fs.stat resolve the symbolic link and returns stat for the
+    // fs.statSync resolve the symbolic link and returns stat for the
     // file it pointed to, so isFile would make sure the resolved
     // file is actually a regular file.
-    const files = [];
-    for (const file of await globber.glob()) {
-        const stats = await promises_default().stat(file);
-        if (stats.isFile()) {
-            files.push(file);
-        }
-    }
-    return files;
+    return (await globber.glob()).filter((file) => external_fs_default().statSync(file).isFile());
 }
 function sort_and_uniq(a) {
     return a

dist/save/index.js

@@ -149506,8 +149506,6 @@ var external_crypto_default = /*#__PURE__*/__nccwpck_require__.n(external_crypto
 // EXTERNAL MODULE: external "fs/promises"
 var promises_ = __nccwpck_require__(91943);
 var promises_default = /*#__PURE__*/__nccwpck_require__.n(promises_);
-;// CONCATENATED MODULE: external "stream/promises"
-const external_stream_promises_namespaceObject = require("stream/promises");
 // EXTERNAL MODULE: external "os"
 var external_os_ = __nccwpck_require__(70857);
 var external_os_default = /*#__PURE__*/__nccwpck_require__.n(external_os_);
@@ -150677,12 +150675,11 @@ function reportError(e) {
         core.error(`${e.stack}`);
     }
 }
-async function getCmdOutput(cmdFormat, cmd, options = {}) {
-    cmd = cmdFormat.replace("{0}", cmd);
+async function getCmdOutput(cmd, args = [], options = {}) {
     let stdout = "";
     let stderr = "";
     try {
-        await exec.exec(cmd, [], {
+        await exec.exec(cmd, args, {
             silent: true,
             listeners: {
                 stdout(data) {
@@ -150697,7 +150694,7 @@ async function getCmdOutput(cmdFormat, cmd, options = {}) {
     }
     catch (e) {
         e.commandFailed = {
-            command: cmd,
+            command: `${cmd} ${args.join(" ")}`,
             stderr,
         };
         throw e;
@@ -150745,12 +150742,11 @@ class Workspace {
         this.root = root;
         this.target = target;
     }
-    async getPackages(cmdFormat, filter, extraArgs) {
-        const cmd = "cargo metadata --all-features --format-version 1" + (extraArgs ? ` ${extraArgs}` : "");
+    async getPackages(filter, ...extraArgs) {
         let packages = [];
         try {
             core.debug(`collecting metadata for "${this.root}"`);
-            const meta = JSON.parse(await getCmdOutput(cmdFormat, cmd, {
+            const meta = JSON.parse(await getCmdOutput("cargo", ["metadata", "--all-features", "--format-version", "1", ...extraArgs], {
                 cwd: this.root,
                 env: { ...process.env, "CARGO_ENCODED_RUSTFLAGS": "" },
             }));
@@ -150765,11 +150761,11 @@ class Workspace {
         }
         return packages;
     }
-    async getPackagesOutsideWorkspaceRoot(cmdFormat) {
-        return await this.getPackages(cmdFormat, (pkg) => !pkg.manifest_path.startsWith(this.root));
+    async getPackagesOutsideWorkspaceRoot() {
+        return await this.getPackages((pkg) => !pkg.manifest_path.startsWith(this.root));
     }
-    async getWorkspaceMembers(cmdFormat) {
-        return await this.getPackages(cmdFormat, (_) => true, "--no-deps");
+    async getWorkspaceMembers() {
+        return await this.getPackages((_) => true, "--no-deps");
     }
 }
 
@@ -150785,15 +150781,12 @@ class Workspace {
 
 
 
-
 const HOME = external_os_default().homedir();
 const CARGO_HOME = process.env.CARGO_HOME || external_path_default().join(HOME, ".cargo");
 const STATE_CONFIG = "RUST_CACHE_CONFIG";
 const HASH_LENGTH = 8;
 class CacheConfig {
     constructor() {
-        /** A format string for running commands */
-        this.cmdFormat = "";
         /** All the paths we want to cache */
         this.cachePaths = [];
         /** The primary cache key */
@@ -150809,7 +150802,7 @@ class CacheConfig {
         /** The prefix portion of the cache key */
         this.keyPrefix = "";
         /** The rust version considered for the cache key */
-        this.keyRust = [];
+        this.keyRust = "";
         /** The environment variables considered for the cache key */
         this.keyEnvs = [];
         /** The files considered for the cache key */
@@ -150822,17 +150815,6 @@ class CacheConfig {
      */
     static async new() {
         const self = new CacheConfig();
-        let cmdFormat = core.getInput("cmd-format");
-        if (cmdFormat) {
-            const placeholderMatches = cmdFormat.match(/\{0\}/g);
-            if (!placeholderMatches || placeholderMatches.length !== 1) {
-                cmdFormat = "{0}";
-            }
-        }
-        else {
-            cmdFormat = "{0}";
-        }
-        self.cmdFormat = cmdFormat;
         // Construct key prefix:
         // This uses either the `shared-key` input,
         // or the `key` input combined with the `job` key.
@@ -150863,15 +150845,12 @@ class CacheConfig {
         // The env vars are sorted, matched by prefix and hashed into the
         // resulting environment hash.
         let hasher = external_crypto_default().createHash("sha1");
-        const rustVersions = Array.from(await getRustVersions(cmdFormat));
-        // Doesn't matter how they're sorted, just as long as it's deterministic.
-        rustVersions.sort();
-        for (const rustVersion of rustVersions) {
-            const { release, host, "commit-hash": commitHash } = rustVersion;
-            const keyRust = `${release} ${host} ${commitHash}`;
+        const rustVersion = await getRustVersion();
+        let keyRust = `${rustVersion.release} ${rustVersion.host}`;
         hasher.update(keyRust);
-            self.keyRust.push(keyRust);
-        }
+        hasher.update(rustVersion["commit-hash"]);
+        keyRust += ` (${rustVersion["commit-hash"]})`;
+        self.keyRust = keyRust;
         // these prefixes should cover most of the compiler / rust / cargo keys
         const envPrefixes = ["CARGO", "CC", "CFLAGS", "CXX", "CMAKE", "RUST"];
         envPrefixes.push(...core.getInput("env-vars").split(/\s+/).filter(Boolean));
@@ -150916,7 +150895,7 @@ class CacheConfig {
             for (const workspace of workspaces) {
                 const root = workspace.root;
                 keyFiles.push(...(await globFiles(`${root}/**/.cargo/config.toml\n${root}/**/rust-toolchain\n${root}/**/rust-toolchain.toml`)));
-                const workspaceMembers = await workspace.getWorkspaceMembers(cmdFormat);
+                const workspaceMembers = await workspace.getWorkspaceMembers();
                 const cargo_manifests = sort_and_uniq(workspaceMembers.map((member) => external_path_default().join(member.path, "Cargo.toml")));
                 for (const cargo_manifest of cargo_manifests) {
                     try {
@@ -150986,7 +150965,9 @@ class CacheConfig {
             }
             keyFiles = sort_and_uniq(keyFiles);
             for (const file of keyFiles) {
-                await (0,external_stream_promises_namespaceObject.pipeline)((0,external_fs_.createReadStream)(file), hasher);
+                for await (const chunk of external_fs_default().createReadStream(file)) {
+                    hasher.update(chunk);
+                }
             }
             keyFiles.push(...parsedKeyFiles);
             self.keyFiles = sort_and_uniq(keyFiles);
@@ -151055,10 +151036,7 @@ class CacheConfig {
         core.info(`.. Prefix:`);
         core.info(`  - ${this.keyPrefix}`);
         core.info(`.. Environment considered:`);
-        core.info(`  - Rust Versions:`);
-        for (const rust of this.keyRust) {
-            core.info(`    - ${rust}`);
-        }
+        core.info(`  - Rust Version: ${this.keyRust}`);
         for (const env of this.keyEnvs) {
             core.info(`  - ${env}`);
         }
@@ -151093,31 +151071,9 @@ function isCacheUpToDate() {
 function digest(hasher) {
     return hasher.digest("hex").substring(0, HASH_LENGTH);
 }
-async function getRustVersions(cmdFormat) {
-    const versions = new Set();
-    versions.add(parseRustVersion(await getCmdOutput(cmdFormat, "rustc -vV")));
-    const stdout = await (async () => {
-        try {
-            return await getCmdOutput(cmdFormat, "rustup toolchain list --quiet");
-        }
-        catch (e) {
-            core.warning(`Error running rustup toolchain list, falling back to default toolchain only: ${e}`);
-            return undefined;
-        }
-    })();
-    if (stdout !== undefined) {
-        for (const toolchain of stdout.split(/[\n\r]+/)) {
-            const trimmed = toolchain.trim();
-            if (!trimmed) {
-                continue;
-            }
-            versions.add(parseRustVersion(await getCmdOutput(cmdFormat, `rustup run ${toolchain} rustc -vV`)));
-        }
-    }
-    return versions;
-}
-function parseRustVersion(stdout) {
-    const splits = stdout
+async function getRustVersion() {
+    const stdout = await getCmdOutput("rustc", ["-vV"]);
+    let splits = stdout
         .split(/[\n\r]+/)
         .filter(Boolean)
         .map((s) => s.split(":").map((s) => s.trim()))
@@ -151128,17 +151084,10 @@ async function globFiles(pattern) {
     const globber = await glob.create(pattern, {
         followSymbolicLinks: false,
     });
-    // fs.stat resolve the symbolic link and returns stat for the
+    // fs.statSync resolve the symbolic link and returns stat for the
     // file it pointed to, so isFile would make sure the resolved
     // file is actually a regular file.
-    const files = [];
-    for (const file of await globber.glob()) {
-        const stats = await promises_default().stat(file);
-        if (stats.isFile()) {
-            files.push(file);
-        }
-    }
-    return files;
+    return (await globber.glob()).filter((file) => external_fs_default().statSync(file).isFile());
 }
 function sort_and_uniq(a) {
     return a
@@ -151479,9 +151428,9 @@ async function run() {
         const workspaceCrates = core.getInput("cache-workspace-crates").toLowerCase() || "false";
         const allPackages = [];
         for (const workspace of config.workspaces) {
-            const packages = await workspace.getPackagesOutsideWorkspaceRoot(config.cmdFormat);
+            const packages = await workspace.getPackagesOutsideWorkspaceRoot();
             if (workspaceCrates === "true") {
-                const wsMembers = await workspace.getWorkspaceMembers(config.cmdFormat);
+                const wsMembers = await workspace.getWorkspaceMembers();
                 packages.push(...wsMembers);
             }
             allPackages.push(...packages);

package-lock.json

@@ -10,16 +10,16 @@
       "license": "LGPL-3.0",
       "dependencies": {
         "@actions/buildjet-cache": "npm:github-actions.cache-buildjet@0.2.0",
-        "@actions/cache": "^5.0.1",
-        "@actions/core": "^2.0.1",
-        "@actions/exec": "^2.0.0",
+        "@actions/cache": "^4.1.0",
+        "@actions/core": "^1.11.1",
+        "@actions/exec": "^1.1.1",
         "@actions/glob": "^0.5.0",
         "@actions/io": "^2.0.0",
         "@actions/warpbuild-cache": "npm:github-actions.warp-cache@1.4.7",
         "smol-toml": "^1.5.2"
       },
       "devDependencies": {
-        "@types/node": "^25.0.2",
+        "@types/node": "^24.10.1",
         "@vercel/ncc": "^0.38.4",
         "linefix": "^0.1.1",
         "typescript": "5.9.3"
@@ -43,25 +43,6 @@
         "uuid": "^3.3.3"
       }
     },
-    "node_modules/@actions/buildjet-cache/node_modules/@actions/core": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.11.1.tgz",
-      "integrity": "sha512-hXJCSrkwfA46Vd9Z3q4cpEpHB1rL5NG04+/rbqW9d3+CSvtB1tYe8UTpAlixa1vj0m/ULglfEK2UKxMGxCxv5A==",
-      "license": "MIT",
-      "dependencies": {
-        "@actions/exec": "^1.1.1",
-        "@actions/http-client": "^2.0.1"
-      }
-    },
-    "node_modules/@actions/buildjet-cache/node_modules/@actions/exec": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@actions/exec/-/exec-1.1.1.tgz",
-      "integrity": "sha512-+sCcHHbVdk93a0XT19ECtO/gIXoxvdsgQLzb2fE2/5sIZmWQuluYyjPQtrtTHdU1YzTZ7bAPN4sITq2xi1679w==",
-      "license": "MIT",
-      "dependencies": {
-        "@actions/io": "^1.0.1"
-      }
-    },
     "node_modules/@actions/buildjet-cache/node_modules/@actions/glob": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/@actions/glob/-/glob-0.1.2.tgz",
@@ -78,62 +59,61 @@
       "license": "MIT"
     },
     "node_modules/@actions/cache": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/@actions/cache/-/cache-5.0.1.tgz",
-      "integrity": "sha512-c+oH047Z2zmXLhjMZfEKjxZfv6Ou7T0sn5fhz6yupICXm5OOR47oZn5zxNO8MP7ttkxv5TOg3WsMrffri5Xhfw==",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/@actions/cache/-/cache-4.1.0.tgz",
+      "integrity": "sha512-z3Opg+P4Y7baq+g1dODXgdtsvPLSewr3ZKpp3U0HQR1A/vWCoJFS52XSezjdngo4SIOdR5oHtyK3a3Arar+X9A==",
       "license": "MIT",
       "dependencies": {
-        "@actions/core": "^2.0.0",
-        "@actions/exec": "^2.0.0",
-        "@actions/glob": "^0.5.0",
-        "@actions/http-client": "^3.0.0",
-        "@actions/io": "^2.0.0",
+        "@actions/core": "^1.11.1",
+        "@actions/exec": "^1.0.1",
+        "@actions/glob": "^0.1.0",
+        "@actions/http-client": "^2.1.1",
+        "@actions/io": "^1.0.1",
         "@azure/abort-controller": "^1.1.0",
-        "@azure/core-rest-pipeline": "^1.22.0",
-        "@azure/storage-blob": "^12.29.1",
+        "@azure/ms-rest-js": "^2.6.0",
+        "@azure/storage-blob": "^12.13.0",
         "@protobuf-ts/runtime-rpc": "^2.11.1",
         "semver": "^6.3.1"
       }
     },
-    "node_modules/@actions/cache/node_modules/@actions/http-client": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@actions/http-client/-/http-client-3.0.0.tgz",
-      "integrity": "sha512-1s3tXAfVMSz9a4ZEBkXXRQD4QhY3+GAsWSbaYpeknPOKEeyRiU3lH+bHiLMZdo2x/fIeQ/hscL1wCkDLVM2DZQ==",
-      "license": "MIT",
+    "node_modules/@actions/cache/node_modules/@actions/glob": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/@actions/glob/-/glob-0.1.2.tgz",
+      "integrity": "sha512-SclLR7Ia5sEqjkJTPs7Sd86maMDw43p769YxBOxvPvEWuPEhpAnBsQfENOpXjFYMmhCqd127bmf+YdvJqVqR4A==",
       "dependencies": {
-        "tunnel": "^0.0.6",
-        "undici": "^5.28.5"
+        "@actions/core": "^1.2.6",
+        "minimatch": "^3.0.4"
       }
     },
+    "node_modules/@actions/cache/node_modules/@actions/io": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/@actions/io/-/io-1.1.3.tgz",
+      "integrity": "sha512-wi9JjgKLYS7U/z8PPbco+PvTb/nRWjeoFlJ1Qer83k/3C5PHQi28hiVdeE2kHXmIL99mQFawx8qt/JPjZilJ8Q==",
+      "license": "MIT"
+    },
     "node_modules/@actions/core": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@actions/core/-/core-2.0.1.tgz",
-      "integrity": "sha512-oBfqT3GwkvLlo1fjvhQLQxuwZCGTarTE5OuZ2Wg10hvhBj7LRIlF611WT4aZS6fDhO5ZKlY7lCAZTlpmyaHaeg==",
-      "license": "MIT",
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.11.1.tgz",
+      "integrity": "sha512-hXJCSrkwfA46Vd9Z3q4cpEpHB1rL5NG04+/rbqW9d3+CSvtB1tYe8UTpAlixa1vj0m/ULglfEK2UKxMGxCxv5A==",
       "dependencies": {
-        "@actions/exec": "^2.0.0",
-        "@actions/http-client": "^3.0.0"
-      }
-    },
-    "node_modules/@actions/core/node_modules/@actions/http-client": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@actions/http-client/-/http-client-3.0.0.tgz",
-      "integrity": "sha512-1s3tXAfVMSz9a4ZEBkXXRQD4QhY3+GAsWSbaYpeknPOKEeyRiU3lH+bHiLMZdo2x/fIeQ/hscL1wCkDLVM2DZQ==",
-      "license": "MIT",
-      "dependencies": {
-        "tunnel": "^0.0.6",
-        "undici": "^5.28.5"
+        "@actions/exec": "^1.1.1",
+        "@actions/http-client": "^2.0.1"
       }
     },
     "node_modules/@actions/exec": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@actions/exec/-/exec-2.0.0.tgz",
-      "integrity": "sha512-k8ngrX2voJ/RIN6r9xB82NVqKpnMRtxDoiO+g3olkIUpQNqjArXrCQceduQZCQj3P3xm32pChRLqRrtXTlqhIw==",
-      "license": "MIT",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@actions/exec/-/exec-1.1.1.tgz",
+      "integrity": "sha512-+sCcHHbVdk93a0XT19ECtO/gIXoxvdsgQLzb2fE2/5sIZmWQuluYyjPQtrtTHdU1YzTZ7bAPN4sITq2xi1679w==",
       "dependencies": {
-        "@actions/io": "^2.0.0"
+        "@actions/io": "^1.0.1"
       }
     },
+    "node_modules/@actions/exec/node_modules/@actions/io": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/@actions/io/-/io-1.1.3.tgz",
+      "integrity": "sha512-wi9JjgKLYS7U/z8PPbco+PvTb/nRWjeoFlJ1Qer83k/3C5PHQi28hiVdeE2kHXmIL99mQFawx8qt/JPjZilJ8Q==",
+      "license": "MIT"
+    },
     "node_modules/@actions/github": {
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/@actions/github/-/github-6.0.1.tgz",
@@ -157,31 +137,6 @@
         "minimatch": "^3.0.4"
       }
     },
-    "node_modules/@actions/glob/node_modules/@actions/core": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.11.1.tgz",
-      "integrity": "sha512-hXJCSrkwfA46Vd9Z3q4cpEpHB1rL5NG04+/rbqW9d3+CSvtB1tYe8UTpAlixa1vj0m/ULglfEK2UKxMGxCxv5A==",
-      "license": "MIT",
-      "dependencies": {
-        "@actions/exec": "^1.1.1",
-        "@actions/http-client": "^2.0.1"
-      }
-    },
-    "node_modules/@actions/glob/node_modules/@actions/exec": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@actions/exec/-/exec-1.1.1.tgz",
-      "integrity": "sha512-+sCcHHbVdk93a0XT19ECtO/gIXoxvdsgQLzb2fE2/5sIZmWQuluYyjPQtrtTHdU1YzTZ7bAPN4sITq2xi1679w==",
-      "license": "MIT",
-      "dependencies": {
-        "@actions/io": "^1.0.1"
-      }
-    },
-    "node_modules/@actions/glob/node_modules/@actions/io": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/@actions/io/-/io-1.1.3.tgz",
-      "integrity": "sha512-wi9JjgKLYS7U/z8PPbco+PvTb/nRWjeoFlJ1Qer83k/3C5PHQi28hiVdeE2kHXmIL99mQFawx8qt/JPjZilJ8Q==",
-      "license": "MIT"
-    },
     "node_modules/@actions/http-client": {
       "version": "2.2.3",
       "resolved": "https://registry.npmjs.org/@actions/http-client/-/http-client-2.2.3.tgz",
@@ -220,25 +175,6 @@
         "uuid": "^3.3.3"
       }
     },
-    "node_modules/@actions/warpbuild-cache/node_modules/@actions/core": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.11.1.tgz",
-      "integrity": "sha512-hXJCSrkwfA46Vd9Z3q4cpEpHB1rL5NG04+/rbqW9d3+CSvtB1tYe8UTpAlixa1vj0m/ULglfEK2UKxMGxCxv5A==",
-      "license": "MIT",
-      "dependencies": {
-        "@actions/exec": "^1.1.1",
-        "@actions/http-client": "^2.0.1"
-      }
-    },
-    "node_modules/@actions/warpbuild-cache/node_modules/@actions/exec": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@actions/exec/-/exec-1.1.1.tgz",
-      "integrity": "sha512-+sCcHHbVdk93a0XT19ECtO/gIXoxvdsgQLzb2fE2/5sIZmWQuluYyjPQtrtTHdU1YzTZ7bAPN4sITq2xi1679w==",
-      "license": "MIT",
-      "dependencies": {
-        "@actions/io": "^1.0.1"
-      }
-    },
     "node_modules/@actions/warpbuild-cache/node_modules/@actions/glob": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/@actions/glob/-/glob-0.1.2.tgz",
@@ -293,7 +229,6 @@
       "version": "1.10.1",
       "resolved": "https://registry.npmjs.org/@azure/core-client/-/core-client-1.10.1.tgz",
       "integrity": "sha512-Nh5PhEOeY6PrnxNPsEHRr9eimxLwgLlpmguQaHKBinFYA/RU9+kOYVOQqOrTsCL+KSxrLLl1gD8Dk5BFW/7l/w==",
-      "license": "MIT",
       "dependencies": {
         "@azure/abort-controller": "^2.1.2",
         "@azure/core-auth": "^1.10.0",
@@ -311,7 +246,6 @@
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/@azure/abort-controller/-/abort-controller-2.1.2.tgz",
       "integrity": "sha512-nBrLsEWm4J2u5LpAPjxADTlq3trDgVZZXHNKabeXZtpq3d3AbN/KGO82R87rdDz5/lYB024rtEf10/q0urNgsA==",
-      "license": "MIT",
       "dependencies": {
         "tslib": "^2.6.2"
       },
@@ -323,7 +257,6 @@
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/@azure/core-http-compat/-/core-http-compat-2.3.1.tgz",
       "integrity": "sha512-az9BkXND3/d5VgdRRQVkiJb2gOmDU8Qcq4GvjtBmDICNiQ9udFmDk4ZpSB5Qq1OmtDJGlQAfBaS4palFsazQ5g==",
-      "license": "MIT",
       "dependencies": {
         "@azure/abort-controller": "^2.1.2",
         "@azure/core-client": "^1.10.0",
@@ -337,7 +270,6 @@
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/@azure/abort-controller/-/abort-controller-2.1.2.tgz",
       "integrity": "sha512-nBrLsEWm4J2u5LpAPjxADTlq3trDgVZZXHNKabeXZtpq3d3AbN/KGO82R87rdDz5/lYB024rtEf10/q0urNgsA==",
-      "license": "MIT",
       "dependencies": {
         "tslib": "^2.6.2"
       },
@@ -497,10 +429,9 @@
       }
     },
     "node_modules/@azure/storage-blob": {
-      "version": "12.29.1",
-      "resolved": "https://registry.npmjs.org/@azure/storage-blob/-/storage-blob-12.29.1.tgz",
-      "integrity": "sha512-7ktyY0rfTM0vo7HvtK6E3UvYnI9qfd6Oz6z/+92VhGRveWng3kJwMKeUpqmW/NmwcDNbxHpSlldG+vsUnRFnBg==",
-      "license": "MIT",
+      "version": "12.28.0",
+      "resolved": "https://registry.npmjs.org/@azure/storage-blob/-/storage-blob-12.28.0.tgz",
+      "integrity": "sha512-VhQHITXXO03SURhDiGuHhvc/k/sD2WvJUS7hqhiVNbErVCuQoLtWql7r97fleBlIRKHJaa9R7DpBjfE0pfLYcA==",
       "dependencies": {
         "@azure/abort-controller": "^2.1.2",
         "@azure/core-auth": "^1.9.0",
@@ -513,7 +444,7 @@
         "@azure/core-util": "^1.11.0",
         "@azure/core-xml": "^1.4.5",
         "@azure/logger": "^1.1.4",
-        "@azure/storage-common": "^12.1.1",
+        "@azure/storage-common": "^12.0.0-beta.2",
         "events": "^3.0.0",
         "tslib": "^2.8.1"
       },
@@ -533,10 +464,9 @@
       }
     },
     "node_modules/@azure/storage-common": {
-      "version": "12.1.1",
-      "resolved": "https://registry.npmjs.org/@azure/storage-common/-/storage-common-12.1.1.tgz",
-      "integrity": "sha512-eIOH1pqFwI6UmVNnDQvmFeSg0XppuzDLFeUNO/Xht7ODAzRLgGDh7h550pSxoA+lPDxBl1+D2m/KG3jWzCUjTg==",
-      "license": "MIT",
+      "version": "12.0.0",
+      "resolved": "https://registry.npmjs.org/@azure/storage-common/-/storage-common-12.0.0.tgz",
+      "integrity": "sha512-QyEWXgi4kdRo0wc1rHum9/KnaWZKCdQGZK1BjU4fFL6Jtedp7KLbQihgTTVxldFy1z1ZPtuDPx8mQ5l3huPPbA==",
       "dependencies": {
         "@azure/abort-controller": "^2.1.2",
         "@azure/core-auth": "^1.9.0",
@@ -556,7 +486,6 @@
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/@azure/abort-controller/-/abort-controller-2.1.2.tgz",
       "integrity": "sha512-nBrLsEWm4J2u5LpAPjxADTlq3trDgVZZXHNKabeXZtpq3d3AbN/KGO82R87rdDz5/lYB024rtEf10/q0urNgsA==",
-      "license": "MIT",
       "dependencies": {
         "tslib": "^2.6.2"
       },
@@ -839,9 +768,9 @@
       "integrity": "sha512-hWtVTC2q7hc7xZ/RLbxapMvDMgUnDvKvMOpKal4DrMyfGBUfB1oKaZlIRr6mJL+If3bAP6sV/QneGzF6tJjZDg=="
     },
     "node_modules/@types/node": {
-      "version": "25.0.2",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.0.2.tgz",
-      "integrity": "sha512-gWEkeiyYE4vqjON/+Obqcoeffmk0NF15WSBwSs7zwVA2bAbTaE0SJ7P0WNGoJn8uE7fiaV5a7dKYIJriEqOrmA==",
+      "version": "24.10.1",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-24.10.1.tgz",
+      "integrity": "sha512-GNWcUTRBgIRJD5zj+Tq0fKOJ5XZajIiBroOF0yvj2bSU1WvNdYS/dn9UxwsujGW4JX06dnHyjV2y9rRaybH0iQ==",
       "license": "MIT",
       "dependencies": {
         "undici-types": "~7.16.0"
@@ -1152,7 +1081,6 @@
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
       "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==",
-      "license": "MIT",
       "engines": {
         "node": ">=0.8.x"
       }

package.json

@@ -24,15 +24,15 @@
   "dependencies": {
     "@actions/buildjet-cache": "npm:github-actions.cache-buildjet@0.2.0",
     "@actions/warpbuild-cache": "npm:github-actions.warp-cache@1.4.7",
-    "@actions/cache": "^5.0.1",
-    "@actions/core": "^2.0.1",
-    "@actions/exec": "^2.0.0",
+    "@actions/cache": "^4.1.0",
+    "@actions/core": "^1.11.1",
+    "@actions/exec": "^1.1.1",
     "@actions/glob": "^0.5.0",
     "@actions/io": "^2.0.0",
     "smol-toml": "^1.5.2"
   },
   "devDependencies": {
-    "@types/node": "^25.0.2",
+    "@types/node": "^24.10.1",
     "@vercel/ncc": "^0.38.4",
     "linefix": "^0.1.1",
     "typescript": "5.9.3"

src/config.ts

@@ -1,9 +1,8 @@
 import * as core from "@actions/core";
 import * as glob from "@actions/glob";
 import crypto from "crypto";
-import fs from "fs/promises";
-import { createReadStream } from "fs";
-import { pipeline } from "stream/promises";
+import fs from "fs";
+import fs_promises from "fs/promises";
 import os from "os";
 import path from "path";
 import * as toml from "smol-toml";
@@ -19,9 +18,6 @@ const STATE_CONFIG = "RUST_CACHE_CONFIG";
 const HASH_LENGTH = 8;
 
 export class CacheConfig {
-  /** A format string for running commands */
-  public cmdFormat: string = "";
-
   /** All the paths we want to cache */
   public cachePaths: Array<string> = [];
   /** The primary cache key */
@@ -41,7 +37,7 @@ export class CacheConfig {
   /** The prefix portion of the cache key */
   private keyPrefix = "";
   /** The rust version considered for the cache key */
-  private keyRust: Array<string> = [];
+  private keyRust = "";
   /** The environment variables considered for the cache key */
   private keyEnvs: Array<string> = [];
   /** The files considered for the cache key */
@@ -57,17 +53,6 @@ export class CacheConfig {
   static async new(): Promise<CacheConfig> {
     const self = new CacheConfig();
 
-    let cmdFormat = core.getInput("cmd-format");
-    if (cmdFormat) {
-      const placeholderMatches = cmdFormat.match(/\{0\}/g);
-      if (!placeholderMatches || placeholderMatches.length !== 1) {
-        cmdFormat = "{0}";
-      }
-    } else {
-      cmdFormat = "{0}";
-    }
-    self.cmdFormat = cmdFormat;
-
     // Construct key prefix:
     // This uses either the `shared-key` input,
     // or the `key` input combined with the `job` key.
@@ -104,16 +89,14 @@ export class CacheConfig {
     // resulting environment hash.
 
     let hasher = crypto.createHash("sha1");
-    const rustVersions = Array.from(await getRustVersions(cmdFormat));
-    // Doesn't matter how they're sorted, just as long as it's deterministic.
-    rustVersions.sort();
+    const rustVersion = await getRustVersion();
 
-    for (const rustVersion of rustVersions) {
-      const { release, host, "commit-hash": commitHash } = rustVersion;
-      const keyRust = `${release} ${host} ${commitHash}`;
+    let keyRust = `${rustVersion.release} ${rustVersion.host}`;
     hasher.update(keyRust);
-      self.keyRust.push(keyRust);
-    }
+    hasher.update(rustVersion["commit-hash"]);
+
+    keyRust += ` (${rustVersion["commit-hash"]})`;
+    self.keyRust = keyRust;
 
     // these prefixes should cover most of the compiler / rust / cargo keys
     const envPrefixes = ["CARGO", "CC", "CFLAGS", "CXX", "CMAKE", "RUST"];
@@ -175,13 +158,13 @@ export class CacheConfig {
           )),
         );
 
-        const workspaceMembers = await workspace.getWorkspaceMembers(cmdFormat);
+        const workspaceMembers = await workspace.getWorkspaceMembers();
 
         const cargo_manifests = sort_and_uniq(workspaceMembers.map((member) => path.join(member.path, "Cargo.toml")));
 
         for (const cargo_manifest of cargo_manifests) {
           try {
-            const content = await fs.readFile(cargo_manifest, { encoding: "utf8" });
+            const content = await fs_promises.readFile(cargo_manifest, { encoding: "utf8" });
             // Use any since TomlPrimitive is not exposed
             const parsed = toml.parse(content) as { [key: string]: any };
 
@@ -228,7 +211,7 @@ export class CacheConfig {
         const cargo_lock = path.join(workspace.root, "Cargo.lock");
         if (await exists(cargo_lock)) {
           try {
-            const content = await fs.readFile(cargo_lock, { encoding: "utf8" });
+            const content = await fs_promises.readFile(cargo_lock, { encoding: "utf8" });
             const parsed = toml.parse(content);
 
             if ((parsed.version !== 3 && parsed.version !== 4) || !("package" in parsed)) {
@@ -256,7 +239,9 @@ export class CacheConfig {
       keyFiles = sort_and_uniq(keyFiles);
 
       for (const file of keyFiles) {
-        await pipeline(createReadStream(file), hasher);
+        for await (const chunk of fs.createReadStream(file)) {
+          hasher.update(chunk);
+        }
       }
 
       keyFiles.push(...parsedKeyFiles);
@@ -336,10 +321,7 @@ export class CacheConfig {
     core.info(`.. Prefix:`);
     core.info(`  - ${this.keyPrefix}`);
     core.info(`.. Environment considered:`);
-    core.info(`  - Rust Versions:`);
-    for (const rust of this.keyRust) {
-      core.info(`    - ${rust}`);
-    }
+    core.info(`  - Rust Version: ${this.keyRust}`);
     for (const env of this.keyEnvs) {
       core.info(`  - ${env}`);
     }
@@ -384,33 +366,9 @@ interface RustVersion {
   "commit-hash": string;
 }
 
-async function getRustVersions(cmdFormat: string): Promise<Set<RustVersion>> {
-  const versions = new Set<RustVersion>();
-
-  versions.add(parseRustVersion(await getCmdOutput(cmdFormat, "rustc -vV")));
-
-  const stdout = await (async () => {
-    try {
-      return await getCmdOutput(cmdFormat, "rustup toolchain list --quiet");
-    } catch (e) {
-      core.warning(`Error running rustup toolchain list, falling back to default toolchain only: ${e}`);
-      return undefined;
-    }
-  })();
-  if (stdout !== undefined) {
-    for (const toolchain of stdout.split(/[\n\r]+/)) {
-      const trimmed = toolchain.trim();
-      if (!trimmed) {
-        continue;
-      }
-      versions.add(parseRustVersion(await getCmdOutput(cmdFormat, `rustup run ${toolchain} rustc -vV`)));
-    }
-  }
-  return versions;
-}
-
-function parseRustVersion(stdout: string): RustVersion {
-  const splits = stdout
+async function getRustVersion(): Promise<RustVersion> {
+  const stdout = await getCmdOutput("rustc", ["-vV"]);
+  let splits = stdout
     .split(/[\n\r]+/)
     .filter(Boolean)
     .map((s) => s.split(":").map((s) => s.trim()))
@@ -422,17 +380,10 @@ async function globFiles(pattern: string): Promise<string[]> {
   const globber = await glob.create(pattern, {
     followSymbolicLinks: false,
   });
-  // fs.stat resolve the symbolic link and returns stat for the
+  // fs.statSync resolve the symbolic link and returns stat for the
   // file it pointed to, so isFile would make sure the resolved
   // file is actually a regular file.
-  const files = [];
-  for (const file of await globber.glob()) {
-    const stats = await fs.stat(file);
-    if (stats.isFile()) {
-      files.push(file);
-    }
-  }
-  return files;
+  return (await globber.glob()).filter((file) => fs.statSync(file).isFile());
 }
 
 function sort_and_uniq(a: string[]) {

src/save.ts

@@ -39,9 +39,9 @@ async function run() {
     const workspaceCrates = core.getInput("cache-workspace-crates").toLowerCase() || "false";
     const allPackages = [];
     for (const workspace of config.workspaces) {
-      const packages = await workspace.getPackagesOutsideWorkspaceRoot(config.cmdFormat);
+      const packages = await workspace.getPackagesOutsideWorkspaceRoot();
       if (workspaceCrates === "true") {
-        const wsMembers = await workspace.getWorkspaceMembers(config.cmdFormat);
+        const wsMembers = await workspace.getWorkspaceMembers();
         packages.push(...wsMembers);
       }
       allPackages.push(...packages);

src/utils.ts

@@ -16,15 +16,14 @@ export function reportError(e: any) {
 }
 
 export async function getCmdOutput(
-  cmdFormat: string,
   cmd: string,
+  args: Array<string> = [],
   options: exec.ExecOptions = {},
 ): Promise<string> {
-  cmd = cmdFormat.replace("{0}", cmd);
   let stdout = "";
   let stderr = "";
   try {
-    await exec.exec(cmd, [], {
+    await exec.exec(cmd, args, {
       silent: true,
       listeners: {
         stdout(data) {
@@ -38,7 +37,7 @@ export async function getCmdOutput(
     });
   } catch (e) {
     (e as any).commandFailed = {
-      command: cmd,
+      command: `${cmd} ${args.join(" ")}`,
       stderr,
     };
     throw e;

src/workspace.ts

@@ -8,13 +8,12 @@ const SAVE_TARGETS = new Set(["lib", "proc-macro"]);
 export class Workspace {
   constructor(public root: string, public target: string) {}
 
-  async getPackages(cmdFormat: string, filter: (p: Meta["packages"][0]) => boolean, extraArgs?: string): Promise<Packages> {
-    const cmd = "cargo metadata --all-features --format-version 1" + (extraArgs ? ` ${extraArgs}` : "");
+  async getPackages(filter: (p: Meta["packages"][0]) => boolean, ...extraArgs: string[]): Promise<Packages> {
     let packages: Packages = [];
     try {
       core.debug(`collecting metadata for "${this.root}"`);
       const meta: Meta = JSON.parse(
-        await getCmdOutput(cmdFormat, cmd, {
+        await getCmdOutput("cargo", ["metadata", "--all-features", "--format-version", "1", ...extraArgs], {
           cwd: this.root,
           env: { ...process.env, "CARGO_ENCODED_RUSTFLAGS": "" },
         }),
@@ -30,12 +29,12 @@ export class Workspace {
     return packages;
   }
 
-  public async getPackagesOutsideWorkspaceRoot(cmdFormat: string): Promise<Packages> {
-    return await this.getPackages(cmdFormat, (pkg) => !pkg.manifest_path.startsWith(this.root));
+  public async getPackagesOutsideWorkspaceRoot(): Promise<Packages> {
+    return await this.getPackages((pkg) => !pkg.manifest_path.startsWith(this.root));
   }
 
-  public async getWorkspaceMembers(cmdFormat: string): Promise<Packages> {
-    return await this.getPackages(cmdFormat, (_) => true, "--no-deps");
+  public async getWorkspaceMembers(): Promise<Packages> {
+    return await this.getPackages((_) => true, "--no-deps");
   }
 }
 

tests/flake.nix

@@ -1,31 +0,0 @@
-{
-  inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
-    flake-utils.url = "github:numtide/flake-utils";
-    rust-overlay = {
-      url = "github:oxalica/rust-overlay";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-  };
-
-  outputs = inputs @ { self, nixpkgs, flake-utils, rust-overlay, ... }:
-    flake-utils.lib.eachDefaultSystem (
-      system: let
-        overlays = [ (import rust-overlay) ];
-        pkgs = import nixpkgs { inherit system overlays; };
-      in {
-        devShells.default = with pkgs; mkShell {
-          buildInputs = [
-            autoconf
-            gcc
-            gnumake
-            openssl
-            pkg-config
-            rust-bin.stable.latest.minimal
-          ];
-          CARGO_TERM_COLOR = "always";
-        };
-      }
-    );
-}
-