2.5.1

update changelog
fix src/config.ts: Remove sort_object (#152 )
2025-12-27 01:53:59 -05:00 · 2023-07-03 19:38:11 +02:00 · 2023-07-03 19:38:01 +02:00 · 2023-06-27 08:55:56 +02:00 · 2023-06-18 15:32:29 +02:00 · 2023-06-18 10:12:25 +02:00
14 changed files with 16054 additions and 16458 deletions
--- a/.github/workflows/check-dist.yml
+++ b/.github/workflows/check-dist.yml
@@ -0,0 +1,45 @@
+name: check dist/
+
+on:
+   push:
+     branches:
+       - master
+     paths-ignore:
+       - '**.md'
+   pull_request:
+     paths-ignore:
+       - '**.md'
+   workflow_dispatch:
+
+jobs:
+  check-dist:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Setup Node.js 16.x
+        uses: actions/setup-node@v3
+        with:
+          node-version: 16.x
+          cache: npm
+
+      - name: Install dependencies
+        run: npm ci
+
+      - name: Rebuild the dist/ directory
+        run: npm run prepare
+
+      - name: Compare the expected and actual dist/ directories
+        run: |
+          if [ "$(git diff dist/ | wc -l)" -gt "0" ]; then
+            echo "Detected uncommitted changes after build. See status below:"
+            git diff
+            exit 1
+          fi
+        id: diff
+
+      - uses: actions/upload-artifact@v3
+        if: ${{ failure() && steps.diff.conclusion == 'failure' }}
+        with:
+          name: dist
+          path: dist/
--- a/.github/workflows/globbed-directories.yml
+++ b/.github/workflows/globbed-directories.yml
@@ -0,0 +1,23 @@
+name: globbed-directories
+
+on: [push, pull_request]
+
+jobs:
+  simple:
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest]
+
+    name: Test `cargo check/test` on ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+
+    env:
+      CARGO_TERM_COLOR: always
+
+    steps:
+      - uses: actions/checkout@v3
+      - name: Create folder that will be globbed
+        run: |
+          mkdir -p folder/rust-toolchain
+      - uses: ./
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,44 @@
 # Changelog

+## 2.5.1
+
+- Fix hash contribution of `Cargo.lock`.
+
+## 2.5.0
+
+- feat: Rm workspace crates version before caching.
+- feat: Add hash of `.cargo/config.toml` to key.
+
+## 2.4.0
+
+- Fix cache key stability.
+- Use 8 character hash components to reduce the key length, making it more readable.
+
+## 2.3.0
+
+- Add `cache-all-crates` option, which enables caching of crates installed by workflows.
+- Add installed packages to cache key, so changes to workflows that install rust tools are detected and cached properly.
+- Fix cache restore failures due to upstream bug.
+- Fix `EISDIR` error due to globed directories.
+- Update runtime `@actions/cache`, `@actions/io` and dev `typescript` dependencies.
+- Update `npm run prepare` so it creates distribution files with the right line endings.
+
+## 2.2.1
+
+- Update `@actions/cache` dependency to fix usage of `zstd` compression.
+
+## 2.2.0
+
+- Add new `save-if` option to always restore, but only conditionally save the cache.
+
+## 2.1.0
+
+- Only hash `Cargo.{lock,toml}` files in the configured workspace directories.
+
 ## 2.0.2

 - Avoid calling `cargo metadata` on pre-cleanup.
+- Added `prefix-key`, `cache-directories` and `cache-targets` options.

 ## 2.0.1

--- a/README.md
+++ b/README.md
@@ -14,11 +14,12 @@ sensible defaults.

 - uses: Swatinem/rust-cache@v2
  with:
-    # The prefix cache key, this can be changed to start a new cache manually
+    # The prefix cache key, this can be changed to start a new cache manually.
    # default: "v0-rust"
    prefix-key: ""

-    # An additional cache key that is stable over multiple jobs
+    # A cache key that is used instead of the automatic `job`-based key,
+    # and is stable over multiple jobs.
    # default: empty
    shared-key: ""

@@ -41,16 +42,29 @@ sensible defaults.
    # default: ". -> target"
    workspaces: ""

-    # Additional non workspace directories, separated by newlines
+    # Additional non workspace directories to be cached, separated by newlines.
    cache-directories: ""

    # Determines whether workspace `target` directories are cached.
+    # If `false`, only the cargo registry will be cached.
    # default: "true"
    cache-targets: ""

    # Determines if the cache should be saved even when the workflow has failed.
    # default: "false"
    cache-on-failure: ""
+
+    # Determines which crates are cached.
+    # If `true` all crates will be cached, otherwise only dependent crates will be cached.
+    # Useful if additional crates are used for CI tooling.
+    # default: "false"
+    cache-all-crates: ""
+
+    # Determiners whether the cache should be saved.
+    # If `false`, the cache is only restored.
+    # Useful for jobs where the matrix is additive e.g. additional Cargo features.
+    # default: "true"
+    save-if: ""
 ```

 Further examples are available in the [.github/workflows](./.github/workflows/) directory.
@@ -122,7 +136,7 @@ otherwise corrupt the cache on macOS builds.
 This specialized cache action is built on top of the upstream cache action
 maintained by GitHub. The same restrictions and limits apply, which are
 documented here:
-https://docs.github.com/en/actions/using-workflows/caching-dependencies-to-speed-up-workflows
+[Caching dependencies to speed up workflows](https://docs.github.com/en/actions/using-workflows/caching-dependencies-to-speed-up-workflows)

 In particular, caches are currently limited to 10 GB in total and exceeding that
 limit will cause eviction of older caches.
--- a/action.yml
+++ b/action.yml
@@ -3,34 +3,42 @@ description: "A GitHub Action that implements smart caching for rust/cargo proje
 author: "Arpad Borsos <swatinem@swatinem.de>"
 inputs:
  prefix-key:
-    description: "The prefix cache key, this can be changed to start a new cache manually"
+    description: "The prefix cache key, this can be changed to start a new cache manually."
    required: false
    default: "v0-rust"
  shared-key:
-    description: "An additional cache key that is stable over multiple jobs"
+    description: "A cache key that is used instead of the automatic `job`-based key, and is stable over multiple jobs."
    required: false
  key:
-    description: "An additional key for the cache"
+    description: "An additional cache key that is added alongside the automatic `job`-based cache key and can be used to further differentiate jobs."
    required: false
  env-vars:
-    description: "Additional environment variables to include in the cache key, separated by spaces"
+    description: "Additional environment variables to include in the cache key, separated by spaces."
    required: false
  workspaces:
-    description: "Paths to multiple Cargo workspaces and their target directories, separated by newlines"
+    description: "Paths to multiple Cargo workspaces and their target directories, separated by newlines."
    required: false
  cache-directories:
-    description: "Additional non workspace directories, separated by newlines"
+    description: "Additional non workspace directories to be cached, separated by newlines."
    required: false
  cache-targets:
-    description: "Determines whether workspace targets are cached"
+    description: "Determines whether workspace targets are cached. If `false`, only the cargo registry will be cached."
    required: false
    default: "true"
  cache-on-failure:
-    description: "Cache even if the build fails. Defaults to false"
+    description: "Cache even if the build fails. Defaults to false."
    required: false
+  cache-all-crates:
+    description: "Determines which crates are cached. If `true` all crates will be cached, otherwise only dependent crates will be cached."
+    required: false
+    default: "false"
+  save-if:
+    description: "Determiners whether the cache should be saved. If `false`, the cache is only restored."
+    required: false
+    default: "true"
 outputs:
  cache-hit:
-    description: "A boolean value that indicates an exact match was found"
+    description: "A boolean value that indicates an exact match was found."
 runs:
  using: "node16"
  main: "dist/restore/index.js"
--- a/dist/restore/index.js
+++ b/dist/restore/index.js
--- a/dist/save/index.js
+++ b/dist/save/index.js
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,32 +1,34 @@
 {
  "name": "rust-cache",
-  "version": "2.0.2",
+  "version": "2.5.1",
  "lockfileVersion": 2,
  "requires": true,
  "packages": {
    "": {
      "name": "rust-cache",
-      "version": "2.0.2",
+      "version": "2.5.1",
      "license": "LGPL-3.0",
      "dependencies": {
-        "@actions/cache": "^3.0.6",
+        "@actions/cache": "^3.2.1",
        "@actions/core": "^1.10.0",
        "@actions/exec": "^1.1.1",
-        "@actions/glob": "^0.3.0",
-        "@actions/io": "^1.1.2"
+        "@actions/glob": "^0.4.0",
+        "@actions/io": "^1.1.3",
+        "toml": "^3.0.0"
      },
      "devDependencies": {
-        "@vercel/ncc": "^0.34.0",
-        "typescript": "4.8.4"
+        "@vercel/ncc": "^0.36.1",
+        "linefix": "^0.1.1",
+        "typescript": "5.0.4"
      },
      "funding": {
        "url": "https://github.com/sponsors/Swatinem"
      }
    },
    "node_modules/@actions/cache": {
-      "version": "3.0.6",
-      "resolved": "https://registry.npmjs.org/@actions/cache/-/cache-3.0.6.tgz",
-      "integrity": "sha512-Tttit+nqmxgb2M5Ufj5p8Lwd+fx329HOTLzxMrY4aaaZqBzqetgWlEfszMyiXfX4cJML+bzLJbyD9rNYt8TJ8g==",
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/@actions/cache/-/cache-3.2.1.tgz",
+      "integrity": "sha512-QurbMiY//02+0kN1adJkMHN44RcZ5kAXfhSnKUZmtSmhMTNqLitGArG1xOkt93NNyByTlLGAc5wIOF/dZ2ENOQ==",
      "dependencies": {
        "@actions/core": "^1.10.0",
        "@actions/exec": "^1.0.1",
@@ -35,7 +37,7 @@
        "@actions/io": "^1.0.1",
        "@azure/abort-controller": "^1.1.0",
        "@azure/ms-rest-js": "^2.6.0",
-        "@azure/storage-blob": "^12.8.0",
+        "@azure/storage-blob": "^12.13.0",
        "semver": "^6.1.0",
        "uuid": "^3.3.3"
      }
@@ -75,26 +77,26 @@
      }
    },
    "node_modules/@actions/glob": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/@actions/glob/-/glob-0.3.0.tgz",
-      "integrity": "sha512-tJP1ZhF87fd6LBnaXWlahkyvdgvsLl7WnreW1EZaC8JWjpMXmzqWzQVe/IEYslrkT9ymibVrKyJN4UMD7uQM2w==",
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/@actions/glob/-/glob-0.4.0.tgz",
+      "integrity": "sha512-+eKIGFhsFa4EBwaf/GMyzCdWrXWymGXfFmZU3FHQvYS8mPcHtTtZONbkcqqUMzw9mJ/pImEBFET1JNifhqGsAQ==",
      "dependencies": {
-        "@actions/core": "^1.2.6",
+        "@actions/core": "^1.9.1",
        "minimatch": "^3.0.4"
      }
    },
    "node_modules/@actions/http-client": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@actions/http-client/-/http-client-2.0.1.tgz",
-      "integrity": "sha512-PIXiMVtz6VvyaRsGY268qvj57hXQEpsYogYOu2nrQhlf+XCGmZstmuZBbAybUl1nQGnvS1k1eEsQ69ZoD7xlSw==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/@actions/http-client/-/http-client-2.1.0.tgz",
+      "integrity": "sha512-BonhODnXr3amchh4qkmjPMUO8mFi/zLaaCeCAJZqch8iQqyDnVIkySjB38VHAC8IJ+bnlgfOqlhpyCUZHlQsqw==",
      "dependencies": {
        "tunnel": "^0.0.6"
      }
    },
    "node_modules/@actions/io": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@actions/io/-/io-1.1.2.tgz",
-      "integrity": "sha512-d+RwPlMp+2qmBfeLYPLXuSRykDIFEwdTA0MMxzS9kh4kvP1ftrc/9fzy6pX6qAjthdXruHQ6/6kjT/DNo5ALuw=="
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/@actions/io/-/io-1.1.3.tgz",
+      "integrity": "sha512-wi9JjgKLYS7U/z8PPbco+PvTb/nRWjeoFlJ1Qer83k/3C5PHQi28hiVdeE2kHXmIL99mQFawx8qt/JPjZilJ8Q=="
    },
    "node_modules/@azure/abort-controller": {
      "version": "1.1.0",
@@ -107,11 +109,6 @@
        "node": ">=12.0.0"
      }
    },
-    "node_modules/@azure/abort-controller/node_modules/tslib": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",
-      "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ=="
-    },
    "node_modules/@azure/core-auth": {
      "version": "1.4.0",
      "resolved": "https://registry.npmjs.org/@azure/core-auth/-/core-auth-1.4.0.tgz",
@@ -124,34 +121,28 @@
        "node": ">=12.0.0"
      }
    },
-    "node_modules/@azure/core-auth/node_modules/tslib": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",
-      "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ=="
-    },
    "node_modules/@azure/core-http": {
-      "version": "2.2.7",
-      "resolved": "https://registry.npmjs.org/@azure/core-http/-/core-http-2.2.7.tgz",
-      "integrity": "sha512-TyGMeDm90mkRS8XzSQbSMD+TqnWL1XKGCh0x0QVGMD8COH2yU0q5SaHm/IBEBkzcq0u73NhS/p57T3KVSgUFqQ==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@azure/core-http/-/core-http-3.0.1.tgz",
+      "integrity": "sha512-A3x+um3cAPgQe42Lu7Iv/x8/fNjhL/nIoEfqFxfn30EyxK6zC13n+OUxzZBRC0IzQqssqIbt4INf5YG7lYYFtw==",
      "dependencies": {
        "@azure/abort-controller": "^1.0.0",
        "@azure/core-auth": "^1.3.0",
        "@azure/core-tracing": "1.0.0-preview.13",
-        "@azure/core-util": "^1.1.0",
+        "@azure/core-util": "^1.1.1",
        "@azure/logger": "^1.0.0",
        "@types/node-fetch": "^2.5.0",
        "@types/tunnel": "^0.0.3",
        "form-data": "^4.0.0",
        "node-fetch": "^2.6.7",
        "process": "^0.11.10",
-        "tough-cookie": "^4.0.0",
        "tslib": "^2.2.0",
        "tunnel": "^0.0.6",
        "uuid": "^8.3.0",
-        "xml2js": "^0.4.19"
+        "xml2js": "^0.5.0"
      },
      "engines": {
-        "node": ">=12.0.0"
+        "node": ">=14.0.0"
      }
    },
    "node_modules/@azure/core-http/node_modules/form-data": {
@@ -167,25 +158,6 @@
        "node": ">= 6"
      }
    },
-    "node_modules/@azure/core-http/node_modules/tough-cookie": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.2.tgz",
-      "integrity": "sha512-G9fqXWoYFZgTc2z8Q5zaHy/vJMjm+WV0AkAeHxVCQiEB1b+dGvWzFW6QV07cY5jQ5gRkeid2qIkzkxUnmoQZUQ==",
-      "dependencies": {
-        "psl": "^1.1.33",
-        "punycode": "^2.1.1",
-        "universalify": "^0.2.0",
-        "url-parse": "^1.5.3"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/@azure/core-http/node_modules/tslib": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",
-      "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ=="
-    },
    "node_modules/@azure/core-http/node_modules/uuid": {
      "version": "8.3.2",
      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
@@ -195,39 +167,30 @@
      }
    },
    "node_modules/@azure/core-lro": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/@azure/core-lro/-/core-lro-2.4.0.tgz",
-      "integrity": "sha512-F65+rYkll1dpw3RGm8/SSiSj+/QkMeYDanzS/QKlM1dmuneVyXbO46C88V1MRHluLGdMP6qfD3vDRYALn0z0tQ==",
+      "version": "2.5.3",
+      "resolved": "https://registry.npmjs.org/@azure/core-lro/-/core-lro-2.5.3.tgz",
+      "integrity": "sha512-ubkOf2YCnVtq7KqEJQqAI8dDD5rH1M6OP5kW0KO/JQyTaxLA0N0pjFWvvaysCj9eHMNBcuuoZXhhl0ypjod2DA==",
      "dependencies": {
        "@azure/abort-controller": "^1.0.0",
+        "@azure/core-util": "^1.2.0",
        "@azure/logger": "^1.0.0",
        "tslib": "^2.2.0"
      },
      "engines": {
-        "node": ">=12.0.0"
+        "node": ">=14.0.0"
      }
    },
-    "node_modules/@azure/core-lro/node_modules/tslib": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",
-      "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ=="
-    },
    "node_modules/@azure/core-paging": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/@azure/core-paging/-/core-paging-1.3.0.tgz",
-      "integrity": "sha512-H6Tg9eBm0brHqLy0OSAGzxIh1t4UL8eZVrSUMJ60Ra9cwq2pOskFqVpz2pYoHDsBY1jZ4V/P8LRGb5D5pmC6rg==",
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/@azure/core-paging/-/core-paging-1.5.0.tgz",
+      "integrity": "sha512-zqWdVIt+2Z+3wqxEOGzR5hXFZ8MGKK52x4vFLw8n58pR6ZfKRx3EXYTxTaYxYHc/PexPUTyimcTWFJbji9Z6Iw==",
      "dependencies": {
        "tslib": "^2.2.0"
      },
      "engines": {
-        "node": ">=12.0.0"
+        "node": ">=14.0.0"
      }
    },
-    "node_modules/@azure/core-paging/node_modules/tslib": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",
-      "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ=="
-    },
    "node_modules/@azure/core-tracing": {
      "version": "1.0.0-preview.13",
      "resolved": "https://registry.npmjs.org/@azure/core-tracing/-/core-tracing-1.0.0-preview.13.tgz",
@@ -240,48 +203,33 @@
        "node": ">=12.0.0"
      }
    },
-    "node_modules/@azure/core-tracing/node_modules/tslib": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",
-      "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ=="
-    },
    "node_modules/@azure/core-util": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@azure/core-util/-/core-util-1.1.1.tgz",
-      "integrity": "sha512-A4TBYVQCtHOigFb2ETiiKFDocBoI1Zk2Ui1KpI42aJSIDexF7DHQFpnjonltXAIU/ceH+1fsZAWWgvX6/AKzog==",
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/@azure/core-util/-/core-util-1.3.2.tgz",
+      "integrity": "sha512-2bECOUh88RvL1pMZTcc6OzfobBeWDBf5oBbhjIhT1MV9otMVWCzpOJkkiKtrnO88y5GGBelgY8At73KGAdbkeQ==",
      "dependencies": {
        "@azure/abort-controller": "^1.0.0",
        "tslib": "^2.2.0"
      },
      "engines": {
-        "node": ">=12.0.0"
+        "node": ">=14.0.0"
      }
    },
-    "node_modules/@azure/core-util/node_modules/tslib": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",
-      "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ=="
-    },
    "node_modules/@azure/logger": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/@azure/logger/-/logger-1.0.3.tgz",
-      "integrity": "sha512-aK4s3Xxjrx3daZr3VylxejK3vG5ExXck5WOHDJ8in/k9AqlfIyFMMT1uG7u8mNjX+QRILTIn0/Xgschfh/dQ9g==",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/@azure/logger/-/logger-1.0.4.tgz",
+      "integrity": "sha512-ustrPY8MryhloQj7OWGe+HrYx+aoiOxzbXTtgblbV3xwCqpzUK36phH3XNHQKj3EPonyFUuDTfR3qFhTEAuZEg==",
      "dependencies": {
        "tslib": "^2.2.0"
      },
      "engines": {
-        "node": ">=12.0.0"
+        "node": ">=14.0.0"
      }
    },
-    "node_modules/@azure/logger/node_modules/tslib": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",
-      "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ=="
-    },
    "node_modules/@azure/ms-rest-js": {
-      "version": "2.6.2",
-      "resolved": "https://registry.npmjs.org/@azure/ms-rest-js/-/ms-rest-js-2.6.2.tgz",
-      "integrity": "sha512-0/8rOxAoR9M3qKUdbGOIYtHtQkm4m5jdoDNdxTU0DkOr84KwyAdJuW/RfjJinGyig4h73DNF0rdCl6XowgCYcg==",
+      "version": "2.6.6",
+      "resolved": "https://registry.npmjs.org/@azure/ms-rest-js/-/ms-rest-js-2.6.6.tgz",
+      "integrity": "sha512-WYIda8VvrkZE68xHgOxUXvjThxNf1nnGPPe0rAljqK5HJHIZ12Pi3YhEDOn3Ge7UnwaaM3eFO0VtAy4nGVI27Q==",
      "dependencies": {
        "@azure/core-auth": "^1.1.4",
        "abort-controller": "^3.0.0",
@@ -291,9 +239,14 @@
        "tslib": "^1.10.0",
        "tunnel": "0.0.6",
        "uuid": "^8.3.2",
-        "xml2js": "^0.4.19"
+        "xml2js": "^0.5.0"
      }
    },
+    "node_modules/@azure/ms-rest-js/node_modules/tslib": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
+    },
    "node_modules/@azure/ms-rest-js/node_modules/uuid": {
      "version": "8.3.2",
      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
@@ -303,12 +256,12 @@
      }
    },
    "node_modules/@azure/storage-blob": {
-      "version": "12.11.0",
-      "resolved": "https://registry.npmjs.org/@azure/storage-blob/-/storage-blob-12.11.0.tgz",
-      "integrity": "sha512-na+FisoARuaOWaHWpmdtk3FeuTWf2VWamdJ9/TJJzj5ZdXPLC3juoDgFs6XVuJIoK30yuBpyFBEDXVRK4pB7Tg==",
+      "version": "12.14.0",
+      "resolved": "https://registry.npmjs.org/@azure/storage-blob/-/storage-blob-12.14.0.tgz",
+      "integrity": "sha512-g8GNUDpMisGXzBeD+sKphhH5yLwesB4JkHr1U6be/X3F+cAMcyGLPD1P89g2M7wbEtUJWoikry1rlr83nNRBzg==",
      "dependencies": {
        "@azure/abort-controller": "^1.0.0",
-        "@azure/core-http": "^2.0.0",
+        "@azure/core-http": "^3.0.0",
        "@azure/core-lro": "^2.2.0",
        "@azure/core-paging": "^1.1.1",
        "@azure/core-tracing": "1.0.0-preview.13",
@@ -317,31 +270,26 @@
        "tslib": "^2.2.0"
      },
      "engines": {
-        "node": ">=12.0.0"
+        "node": ">=14.0.0"
      }
    },
-    "node_modules/@azure/storage-blob/node_modules/tslib": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",
-      "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ=="
-    },
    "node_modules/@opentelemetry/api": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/api/-/api-1.2.0.tgz",
-      "integrity": "sha512-0nBr+VZNKm9tvNDZFstI3Pq1fCTEDK5OZTnVKNvBNAKgd0yIvmwsP4m61rEv7ZP+tOUjWJhROpxK5MsnlF911g==",
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/api/-/api-1.4.1.tgz",
+      "integrity": "sha512-O2yRJce1GOc6PAy3QxFM4NzFiWzvScDC1/5ihYBL6BUEVdq0XMWN01sppE+H6bBXbaFYipjwFLEWLg5PaSOThA==",
      "engines": {
        "node": ">=8.0.0"
      }
    },
    "node_modules/@types/node": {
-      "version": "18.8.5",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.8.5.tgz",
-      "integrity": "sha512-Bq7G3AErwe5A/Zki5fdD3O6+0zDChhg671NfPjtIcbtzDNZTv4NPKMRFr7gtYPG7y+B8uTiNK4Ngd9T0FTar6Q=="
+      "version": "20.1.3",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.1.3.tgz",
+      "integrity": "sha512-NP2yfZpgmf2eDRPmgGq+fjGjSwFgYbihA8/gK+ey23qT9RkxsgNTZvGOEpXgzIGqesTYkElELLgtKoMQTys5vA=="
    },
    "node_modules/@types/node-fetch": {
-      "version": "2.6.2",
-      "resolved": "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.6.2.tgz",
-      "integrity": "sha512-DHqhlq5jeESLy19TYhLakJ07kNumXWjcDdxXsLUMJZ6ue8VZJj4kLPQVE/2mdHh3xZziNF1xppu5lwmS53HR+A==",
+      "version": "2.6.3",
+      "resolved": "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.6.3.tgz",
+      "integrity": "sha512-ETTL1mOEdq/sxUtgtOhKjyB2Irra4cjxksvcMUR5Zr4n+PxVhsCD9WS46oPbHL3et9Zde7CNRr+WUNlcHvsX+w==",
      "dependencies": {
        "@types/node": "*",
        "form-data": "^3.0.0"
@@ -369,9 +317,9 @@
      }
    },
    "node_modules/@vercel/ncc": {
-      "version": "0.34.0",
-      "resolved": "https://registry.npmjs.org/@vercel/ncc/-/ncc-0.34.0.tgz",
-      "integrity": "sha512-G9h5ZLBJ/V57Ou9vz5hI8pda/YQX5HQszCs3AmIus3XzsmRn/0Ptic5otD3xVST8QLKk7AMk7AqpsyQGN7MZ9A==",
+      "version": "0.36.1",
+      "resolved": "https://registry.npmjs.org/@vercel/ncc/-/ncc-0.36.1.tgz",
+      "integrity": "sha512-S4cL7Taa9yb5qbv+6wLgiKVZ03Qfkc4jGRuiUQMQ8HGBD5pcNRnHeYM33zBvJE4/zJGjJJ8GScB+WmTsn9mORw==",
      "dev": true,
      "bin": {
        "ncc": "dist/ncc/cli.js"
@@ -468,6 +416,15 @@
        "node": ">=4"
      }
    },
+    "node_modules/linefix": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/linefix/-/linefix-0.1.1.tgz",
+      "integrity": "sha512-fHYLcNWUGTs3QjR8GD8tzHmkVbIoTbjcB5MLXs1Iu1cZazTvcUKaCiuarDM0jVygLnpxLTVbbihLJevKARmqrA==",
+      "dev": true,
+      "bin": {
+        "linefix": "bin/fix.js"
+      }
+    },
    "node_modules/mime-db": {
      "version": "1.52.0",
      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
@@ -499,9 +456,9 @@
      }
    },
    "node_modules/node-fetch": {
-      "version": "2.6.7",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
-      "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==",
+      "version": "2.6.11",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.11.tgz",
+      "integrity": "sha512-4I6pdBY1EthSqDmJkiNk3JIT8cswwR9nfeW/cPdUagJYEQG7R95WRH74wpz7ma8Gh/9dI9FP+OU+0E4FvtA55w==",
      "dependencies": {
        "whatwg-url": "^5.0.0"
      },
@@ -531,23 +488,13 @@
      "integrity": "sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag=="
    },
    "node_modules/punycode": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz",
+      "integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==",
      "engines": {
        "node": ">=6"
      }
    },
-    "node_modules/querystringify": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",
-      "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ=="
-    },
-    "node_modules/requires-port": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
-      "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ=="
-    },
    "node_modules/sax": {
      "version": "1.2.4",
      "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
@@ -561,6 +508,11 @@
        "semver": "bin/semver.js"
      }
    },
+    "node_modules/toml": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/toml/-/toml-3.0.0.tgz",
+      "integrity": "sha512-y/mWCZinnvxjTKYhJ+pYxwD0mRLVvOtdS2Awbgxln6iEnt4rk0yBxeSBHkGJcPucRiG0e55mwWp+g/05rsrd6w=="
+    },
    "node_modules/tough-cookie": {
      "version": "3.0.1",
      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-3.0.1.tgz",
@@ -580,9 +532,9 @@
      "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="
    },
    "node_modules/tslib": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz",
+      "integrity": "sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg=="
    },
    "node_modules/tunnel": {
      "version": "0.0.6",
@@ -593,33 +545,16 @@
      }
    },
    "node_modules/typescript": {
-      "version": "4.8.4",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.8.4.tgz",
-      "integrity": "sha512-QCh+85mCy+h0IGff8r5XWzOVSbBO+KfeYrMQh7NJ58QujwcE22u+NUSmUxqF+un70P9GXKxa2HCNiTTMJknyjQ==",
+      "version": "5.0.4",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.0.4.tgz",
+      "integrity": "sha512-cW9T5W9xY37cc+jfEnaUvX91foxtHkza3Nw3wkoF4sSlKn0MONdkdEndig/qPBWXNkmplh3NzayQzCiHM4/hqw==",
      "dev": true,
      "bin": {
        "tsc": "bin/tsc",
        "tsserver": "bin/tsserver"
      },
      "engines": {
-        "node": ">=4.2.0"
-      }
-    },
-    "node_modules/universalify": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz",
-      "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==",
-      "engines": {
-        "node": ">= 4.0.0"
-      }
-    },
-    "node_modules/url-parse": {
-      "version": "1.5.10",
-      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
-      "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==",
-      "dependencies": {
-        "querystringify": "^2.1.1",
-        "requires-port": "^1.0.0"
+        "node": ">=12.20"
      }
    },
    "node_modules/uuid": {
@@ -646,9 +581,9 @@
      }
    },
    "node_modules/xml2js": {
-      "version": "0.4.23",
-      "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.23.tgz",
-      "integrity": "sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug==",
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.5.0.tgz",
+      "integrity": "sha512-drPFnkQJik/O+uPKpqSgr22mpuFHqKdbS835iAQrUC73L2F5WkboIRd63ai/2Yg6I1jzifPFKH2NTK+cfglkIA==",
      "dependencies": {
        "sax": ">=0.6.0",
        "xmlbuilder": "~11.0.0"
@@ -668,9 +603,9 @@
  },
  "dependencies": {
    "@actions/cache": {
-      "version": "3.0.6",
-      "resolved": "https://registry.npmjs.org/@actions/cache/-/cache-3.0.6.tgz",
-      "integrity": "sha512-Tttit+nqmxgb2M5Ufj5p8Lwd+fx329HOTLzxMrY4aaaZqBzqetgWlEfszMyiXfX4cJML+bzLJbyD9rNYt8TJ8g==",
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/@actions/cache/-/cache-3.2.1.tgz",
+      "integrity": "sha512-QurbMiY//02+0kN1adJkMHN44RcZ5kAXfhSnKUZmtSmhMTNqLitGArG1xOkt93NNyByTlLGAc5wIOF/dZ2ENOQ==",
      "requires": {
        "@actions/core": "^1.10.0",
        "@actions/exec": "^1.0.1",
@@ -679,7 +614,7 @@
        "@actions/io": "^1.0.1",
        "@azure/abort-controller": "^1.1.0",
        "@azure/ms-rest-js": "^2.6.0",
-        "@azure/storage-blob": "^12.8.0",
+        "@azure/storage-blob": "^12.13.0",
        "semver": "^6.1.0",
        "uuid": "^3.3.3"
      },
@@ -720,26 +655,26 @@
      }
    },
    "@actions/glob": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/@actions/glob/-/glob-0.3.0.tgz",
-      "integrity": "sha512-tJP1ZhF87fd6LBnaXWlahkyvdgvsLl7WnreW1EZaC8JWjpMXmzqWzQVe/IEYslrkT9ymibVrKyJN4UMD7uQM2w==",
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/@actions/glob/-/glob-0.4.0.tgz",
+      "integrity": "sha512-+eKIGFhsFa4EBwaf/GMyzCdWrXWymGXfFmZU3FHQvYS8mPcHtTtZONbkcqqUMzw9mJ/pImEBFET1JNifhqGsAQ==",
      "requires": {
-        "@actions/core": "^1.2.6",
+        "@actions/core": "^1.9.1",
        "minimatch": "^3.0.4"
      }
    },
    "@actions/http-client": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@actions/http-client/-/http-client-2.0.1.tgz",
-      "integrity": "sha512-PIXiMVtz6VvyaRsGY268qvj57hXQEpsYogYOu2nrQhlf+XCGmZstmuZBbAybUl1nQGnvS1k1eEsQ69ZoD7xlSw==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/@actions/http-client/-/http-client-2.1.0.tgz",
+      "integrity": "sha512-BonhODnXr3amchh4qkmjPMUO8mFi/zLaaCeCAJZqch8iQqyDnVIkySjB38VHAC8IJ+bnlgfOqlhpyCUZHlQsqw==",
      "requires": {
        "tunnel": "^0.0.6"
      }
    },
    "@actions/io": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@actions/io/-/io-1.1.2.tgz",
-      "integrity": "sha512-d+RwPlMp+2qmBfeLYPLXuSRykDIFEwdTA0MMxzS9kh4kvP1ftrc/9fzy6pX6qAjthdXruHQ6/6kjT/DNo5ALuw=="
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/@actions/io/-/io-1.1.3.tgz",
+      "integrity": "sha512-wi9JjgKLYS7U/z8PPbco+PvTb/nRWjeoFlJ1Qer83k/3C5PHQi28hiVdeE2kHXmIL99mQFawx8qt/JPjZilJ8Q=="
    },
    "@azure/abort-controller": {
      "version": "1.1.0",
@@ -747,13 +682,6 @@
      "integrity": "sha512-TrRLIoSQVzfAJX9H1JeFjzAoDGcoK1IYX1UImfceTZpsyYfWr09Ss1aHW1y5TrrR3iq6RZLBwJ3E24uwPhwahw==",
      "requires": {
        "tslib": "^2.2.0"
-      },
-      "dependencies": {
-        "tslib": {
-          "version": "2.4.0",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",
-          "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ=="
-        }
      }
    },
    "@azure/core-auth": {
@@ -763,35 +691,27 @@
      "requires": {
        "@azure/abort-controller": "^1.0.0",
        "tslib": "^2.2.0"
-      },
-      "dependencies": {
-        "tslib": {
-          "version": "2.4.0",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",
-          "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ=="
-        }
      }
    },
    "@azure/core-http": {
-      "version": "2.2.7",
-      "resolved": "https://registry.npmjs.org/@azure/core-http/-/core-http-2.2.7.tgz",
-      "integrity": "sha512-TyGMeDm90mkRS8XzSQbSMD+TqnWL1XKGCh0x0QVGMD8COH2yU0q5SaHm/IBEBkzcq0u73NhS/p57T3KVSgUFqQ==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@azure/core-http/-/core-http-3.0.1.tgz",
+      "integrity": "sha512-A3x+um3cAPgQe42Lu7Iv/x8/fNjhL/nIoEfqFxfn30EyxK6zC13n+OUxzZBRC0IzQqssqIbt4INf5YG7lYYFtw==",
      "requires": {
        "@azure/abort-controller": "^1.0.0",
        "@azure/core-auth": "^1.3.0",
        "@azure/core-tracing": "1.0.0-preview.13",
-        "@azure/core-util": "^1.1.0",
+        "@azure/core-util": "^1.1.1",
        "@azure/logger": "^1.0.0",
        "@types/node-fetch": "^2.5.0",
        "@types/tunnel": "^0.0.3",
        "form-data": "^4.0.0",
        "node-fetch": "^2.6.7",
        "process": "^0.11.10",
-        "tough-cookie": "^4.0.0",
        "tslib": "^2.2.0",
        "tunnel": "^0.0.6",
        "uuid": "^8.3.0",
-        "xml2js": "^0.4.19"
+        "xml2js": "^0.5.0"
      },
      "dependencies": {
        "form-data": {
@@ -804,22 +724,6 @@
            "mime-types": "^2.1.12"
          }
        },
-        "tough-cookie": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.2.tgz",
-          "integrity": "sha512-G9fqXWoYFZgTc2z8Q5zaHy/vJMjm+WV0AkAeHxVCQiEB1b+dGvWzFW6QV07cY5jQ5gRkeid2qIkzkxUnmoQZUQ==",
-          "requires": {
-            "psl": "^1.1.33",
-            "punycode": "^2.1.1",
-            "universalify": "^0.2.0",
-            "url-parse": "^1.5.3"
-          }
-        },
-        "tslib": {
-          "version": "2.4.0",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",
-          "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ=="
-        },
        "uuid": {
          "version": "8.3.2",
          "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
@@ -828,35 +732,22 @@
      }
    },
    "@azure/core-lro": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/@azure/core-lro/-/core-lro-2.4.0.tgz",
-      "integrity": "sha512-F65+rYkll1dpw3RGm8/SSiSj+/QkMeYDanzS/QKlM1dmuneVyXbO46C88V1MRHluLGdMP6qfD3vDRYALn0z0tQ==",
+      "version": "2.5.3",
+      "resolved": "https://registry.npmjs.org/@azure/core-lro/-/core-lro-2.5.3.tgz",
+      "integrity": "sha512-ubkOf2YCnVtq7KqEJQqAI8dDD5rH1M6OP5kW0KO/JQyTaxLA0N0pjFWvvaysCj9eHMNBcuuoZXhhl0ypjod2DA==",
      "requires": {
        "@azure/abort-controller": "^1.0.0",
+        "@azure/core-util": "^1.2.0",
        "@azure/logger": "^1.0.0",
        "tslib": "^2.2.0"
-      },
-      "dependencies": {
-        "tslib": {
-          "version": "2.4.0",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",
-          "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ=="
-        }
      }
    },
    "@azure/core-paging": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/@azure/core-paging/-/core-paging-1.3.0.tgz",
-      "integrity": "sha512-H6Tg9eBm0brHqLy0OSAGzxIh1t4UL8eZVrSUMJ60Ra9cwq2pOskFqVpz2pYoHDsBY1jZ4V/P8LRGb5D5pmC6rg==",
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/@azure/core-paging/-/core-paging-1.5.0.tgz",
+      "integrity": "sha512-zqWdVIt+2Z+3wqxEOGzR5hXFZ8MGKK52x4vFLw8n58pR6ZfKRx3EXYTxTaYxYHc/PexPUTyimcTWFJbji9Z6Iw==",
      "requires": {
        "tslib": "^2.2.0"
-      },
-      "dependencies": {
-        "tslib": {
-          "version": "2.4.0",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",
-          "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ=="
-        }
      }
    },
    "@azure/core-tracing": {
@@ -866,50 +757,29 @@
      "requires": {
        "@opentelemetry/api": "^1.0.1",
        "tslib": "^2.2.0"
-      },
-      "dependencies": {
-        "tslib": {
-          "version": "2.4.0",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",
-          "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ=="
-        }
      }
    },
    "@azure/core-util": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@azure/core-util/-/core-util-1.1.1.tgz",
-      "integrity": "sha512-A4TBYVQCtHOigFb2ETiiKFDocBoI1Zk2Ui1KpI42aJSIDexF7DHQFpnjonltXAIU/ceH+1fsZAWWgvX6/AKzog==",
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/@azure/core-util/-/core-util-1.3.2.tgz",
+      "integrity": "sha512-2bECOUh88RvL1pMZTcc6OzfobBeWDBf5oBbhjIhT1MV9otMVWCzpOJkkiKtrnO88y5GGBelgY8At73KGAdbkeQ==",
      "requires": {
        "@azure/abort-controller": "^1.0.0",
        "tslib": "^2.2.0"
-      },
-      "dependencies": {
-        "tslib": {
-          "version": "2.4.0",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",
-          "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ=="
-        }
      }
    },
    "@azure/logger": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/@azure/logger/-/logger-1.0.3.tgz",
-      "integrity": "sha512-aK4s3Xxjrx3daZr3VylxejK3vG5ExXck5WOHDJ8in/k9AqlfIyFMMT1uG7u8mNjX+QRILTIn0/Xgschfh/dQ9g==",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/@azure/logger/-/logger-1.0.4.tgz",
+      "integrity": "sha512-ustrPY8MryhloQj7OWGe+HrYx+aoiOxzbXTtgblbV3xwCqpzUK36phH3XNHQKj3EPonyFUuDTfR3qFhTEAuZEg==",
      "requires": {
        "tslib": "^2.2.0"
-      },
-      "dependencies": {
-        "tslib": {
-          "version": "2.4.0",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",
-          "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ=="
-        }
      }
    },
    "@azure/ms-rest-js": {
-      "version": "2.6.2",
-      "resolved": "https://registry.npmjs.org/@azure/ms-rest-js/-/ms-rest-js-2.6.2.tgz",
-      "integrity": "sha512-0/8rOxAoR9M3qKUdbGOIYtHtQkm4m5jdoDNdxTU0DkOr84KwyAdJuW/RfjJinGyig4h73DNF0rdCl6XowgCYcg==",
+      "version": "2.6.6",
+      "resolved": "https://registry.npmjs.org/@azure/ms-rest-js/-/ms-rest-js-2.6.6.tgz",
+      "integrity": "sha512-WYIda8VvrkZE68xHgOxUXvjThxNf1nnGPPe0rAljqK5HJHIZ12Pi3YhEDOn3Ge7UnwaaM3eFO0VtAy4nGVI27Q==",
      "requires": {
        "@azure/core-auth": "^1.1.4",
        "abort-controller": "^3.0.0",
@@ -919,9 +789,14 @@
        "tslib": "^1.10.0",
        "tunnel": "0.0.6",
        "uuid": "^8.3.2",
-        "xml2js": "^0.4.19"
+        "xml2js": "^0.5.0"
      },
      "dependencies": {
+        "tslib": {
+          "version": "1.14.1",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+          "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
+        },
        "uuid": {
          "version": "8.3.2",
          "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
@@ -930,41 +805,34 @@
      }
    },
    "@azure/storage-blob": {
-      "version": "12.11.0",
-      "resolved": "https://registry.npmjs.org/@azure/storage-blob/-/storage-blob-12.11.0.tgz",
-      "integrity": "sha512-na+FisoARuaOWaHWpmdtk3FeuTWf2VWamdJ9/TJJzj5ZdXPLC3juoDgFs6XVuJIoK30yuBpyFBEDXVRK4pB7Tg==",
+      "version": "12.14.0",
+      "resolved": "https://registry.npmjs.org/@azure/storage-blob/-/storage-blob-12.14.0.tgz",
+      "integrity": "sha512-g8GNUDpMisGXzBeD+sKphhH5yLwesB4JkHr1U6be/X3F+cAMcyGLPD1P89g2M7wbEtUJWoikry1rlr83nNRBzg==",
      "requires": {
        "@azure/abort-controller": "^1.0.0",
-        "@azure/core-http": "^2.0.0",
+        "@azure/core-http": "^3.0.0",
        "@azure/core-lro": "^2.2.0",
        "@azure/core-paging": "^1.1.1",
        "@azure/core-tracing": "1.0.0-preview.13",
        "@azure/logger": "^1.0.0",
        "events": "^3.0.0",
        "tslib": "^2.2.0"
-      },
-      "dependencies": {
-        "tslib": {
-          "version": "2.4.0",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",
-          "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ=="
-        }
      }
    },
    "@opentelemetry/api": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/api/-/api-1.2.0.tgz",
-      "integrity": "sha512-0nBr+VZNKm9tvNDZFstI3Pq1fCTEDK5OZTnVKNvBNAKgd0yIvmwsP4m61rEv7ZP+tOUjWJhROpxK5MsnlF911g=="
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/@opentelemetry/api/-/api-1.4.1.tgz",
+      "integrity": "sha512-O2yRJce1GOc6PAy3QxFM4NzFiWzvScDC1/5ihYBL6BUEVdq0XMWN01sppE+H6bBXbaFYipjwFLEWLg5PaSOThA=="
    },
    "@types/node": {
-      "version": "18.8.5",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.8.5.tgz",
-      "integrity": "sha512-Bq7G3AErwe5A/Zki5fdD3O6+0zDChhg671NfPjtIcbtzDNZTv4NPKMRFr7gtYPG7y+B8uTiNK4Ngd9T0FTar6Q=="
+      "version": "20.1.3",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.1.3.tgz",
+      "integrity": "sha512-NP2yfZpgmf2eDRPmgGq+fjGjSwFgYbihA8/gK+ey23qT9RkxsgNTZvGOEpXgzIGqesTYkElELLgtKoMQTys5vA=="
    },
    "@types/node-fetch": {
-      "version": "2.6.2",
-      "resolved": "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.6.2.tgz",
-      "integrity": "sha512-DHqhlq5jeESLy19TYhLakJ07kNumXWjcDdxXsLUMJZ6ue8VZJj4kLPQVE/2mdHh3xZziNF1xppu5lwmS53HR+A==",
+      "version": "2.6.3",
+      "resolved": "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.6.3.tgz",
+      "integrity": "sha512-ETTL1mOEdq/sxUtgtOhKjyB2Irra4cjxksvcMUR5Zr4n+PxVhsCD9WS46oPbHL3et9Zde7CNRr+WUNlcHvsX+w==",
      "requires": {
        "@types/node": "*",
        "form-data": "^3.0.0"
@@ -991,9 +859,9 @@
      }
    },
    "@vercel/ncc": {
-      "version": "0.34.0",
-      "resolved": "https://registry.npmjs.org/@vercel/ncc/-/ncc-0.34.0.tgz",
-      "integrity": "sha512-G9h5ZLBJ/V57Ou9vz5hI8pda/YQX5HQszCs3AmIus3XzsmRn/0Ptic5otD3xVST8QLKk7AMk7AqpsyQGN7MZ9A==",
+      "version": "0.36.1",
+      "resolved": "https://registry.npmjs.org/@vercel/ncc/-/ncc-0.36.1.tgz",
+      "integrity": "sha512-S4cL7Taa9yb5qbv+6wLgiKVZ03Qfkc4jGRuiUQMQ8HGBD5pcNRnHeYM33zBvJE4/zJGjJJ8GScB+WmTsn9mORw==",
      "dev": true
    },
    "abort-controller": {
@@ -1066,6 +934,12 @@
      "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-2.1.0.tgz",
      "integrity": "sha512-58yWmlHpp7VYfcdTwMTvwMmqx/Elfxjd9RXTDyMsbL7lLWmhMylLEqiYVLKuLzOZqVgiWXD9MfR62Vv89VRxkw=="
    },
+    "linefix": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/linefix/-/linefix-0.1.1.tgz",
+      "integrity": "sha512-fHYLcNWUGTs3QjR8GD8tzHmkVbIoTbjcB5MLXs1Iu1cZazTvcUKaCiuarDM0jVygLnpxLTVbbihLJevKARmqrA==",
+      "dev": true
+    },
    "mime-db": {
      "version": "1.52.0",
      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
@@ -1088,9 +962,9 @@
      }
    },
    "node-fetch": {
-      "version": "2.6.7",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
-      "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==",
+      "version": "2.6.11",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.11.tgz",
+      "integrity": "sha512-4I6pdBY1EthSqDmJkiNk3JIT8cswwR9nfeW/cPdUagJYEQG7R95WRH74wpz7ma8Gh/9dI9FP+OU+0E4FvtA55w==",
      "requires": {
        "whatwg-url": "^5.0.0"
      }
@@ -1106,19 +980,9 @@
      "integrity": "sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag=="
    },
    "punycode": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
-    },
-    "querystringify": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",
-      "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ=="
-    },
-    "requires-port": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
-      "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ=="
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz",
+      "integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA=="
    },
    "sax": {
      "version": "1.2.4",
@@ -1130,6 +994,11 @@
      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
    },
+    "toml": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/toml/-/toml-3.0.0.tgz",
+      "integrity": "sha512-y/mWCZinnvxjTKYhJ+pYxwD0mRLVvOtdS2Awbgxln6iEnt4rk0yBxeSBHkGJcPucRiG0e55mwWp+g/05rsrd6w=="
+    },
    "tough-cookie": {
      "version": "3.0.1",
      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-3.0.1.tgz",
@@ -1146,9 +1015,9 @@
      "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="
    },
    "tslib": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz",
+      "integrity": "sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg=="
    },
    "tunnel": {
      "version": "0.0.6",
@@ -1156,25 +1025,11 @@
      "integrity": "sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg=="
    },
    "typescript": {
-      "version": "4.8.4",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.8.4.tgz",
-      "integrity": "sha512-QCh+85mCy+h0IGff8r5XWzOVSbBO+KfeYrMQh7NJ58QujwcE22u+NUSmUxqF+un70P9GXKxa2HCNiTTMJknyjQ==",
+      "version": "5.0.4",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.0.4.tgz",
+      "integrity": "sha512-cW9T5W9xY37cc+jfEnaUvX91foxtHkza3Nw3wkoF4sSlKn0MONdkdEndig/qPBWXNkmplh3NzayQzCiHM4/hqw==",
      "dev": true
    },
-    "universalify": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz",
-      "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg=="
-    },
-    "url-parse": {
-      "version": "1.5.10",
-      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
-      "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==",
-      "requires": {
-        "querystringify": "^2.1.1",
-        "requires-port": "^1.0.0"
-      }
-    },
    "uuid": {
      "version": "3.4.0",
      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
@@ -1195,9 +1050,9 @@
      }
    },
    "xml2js": {
-      "version": "0.4.23",
-      "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.23.tgz",
-      "integrity": "sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug==",
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.5.0.tgz",
+      "integrity": "sha512-drPFnkQJik/O+uPKpqSgr22mpuFHqKdbS835iAQrUC73L2F5WkboIRd63ai/2Yg6I1jzifPFKH2NTK+cfglkIA==",
      "requires": {
        "sax": ">=0.6.0",
        "xmlbuilder": "~11.0.0"
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
  "private": true,
  "name": "rust-cache",
-  "version": "2.0.2",
+  "version": "2.5.1",
  "description": "A GitHub Action that implements smart caching for rust/cargo projects with sensible defaults.",
  "keywords": [
    "actions",
@@ -22,17 +22,19 @@
  },
  "homepage": "https://github.com/Swatinem/rust-cache#readme",
  "dependencies": {
-    "@actions/cache": "^3.0.6",
+    "@actions/cache": "^3.2.1",
    "@actions/core": "^1.10.0",
    "@actions/exec": "^1.1.1",
-    "@actions/glob": "^0.3.0",
-    "@actions/io": "^1.1.2"
+    "@actions/glob": "^0.4.0",
+    "@actions/io": "^1.1.3",
+    "toml": "^3.0.0"
  },
  "devDependencies": {
-    "@vercel/ncc": "^0.34.0",
-    "typescript": "4.8.4"
+    "@vercel/ncc": "^0.36.1",
+    "linefix": "^0.1.1",
+    "typescript": "5.0.4"
  },
  "scripts": {
-    "prepare": "ncc build --target es2020 -o dist/restore src/restore.ts && ncc build --target es2020 -o dist/save src/save.ts"
+    "prepare": "ncc build --target es2020 -o dist/restore src/restore.ts && ncc build --target es2020 -o dist/save src/save.ts && linefix dist"
  }
 }
--- a/src/cleanup.ts
+++ b/src/cleanup.ts
@@ -3,7 +3,7 @@ import * as io from "@actions/io";
 import fs from "fs";
 import path from "path";

-import { CARGO_HOME, STATE_BINS } from "./config";
+import { CARGO_HOME } from "./config";
 import { Packages } from "./workspace";

 export async function cleanTargetDir(targetDir: string, packages: Packages, checkTimestamp = false) {
@@ -69,9 +69,14 @@ export async function getCargoBins(): Promise<Set<string>> {
  return bins;
 }

-export async function cleanBin() {
+/**
+ * Clean the cargo bin directory, removing the binaries that existed
+ * when the action started, as they were not created by the build.
+ *
+ * @param oldBins The binaries that existed when the action started.
+ */
+export async function cleanBin(oldBins: Array<string>) {
  const bins = await getCargoBins();
-  const oldBins = JSON.parse(core.getState(STATE_BINS));

  for (const bin of oldBins) {
    bins.delete(bin);
@@ -85,7 +90,7 @@ export async function cleanBin() {
  }
 }

-export async function cleanRegistry(packages: Packages) {
+export async function cleanRegistry(packages: Packages, crates = true) {
  // `.cargo/registry/src`
  // we can remove this completely, as cargo will recreate this from `cache`
  await rmRF(path.join(CARGO_HOME, "registry", "src"));
@@ -106,6 +111,11 @@ export async function cleanRegistry(packages: Packages) {
    }
  }

+  if (!crates) {
+    core.debug(`skipping crate cleanup`);
+    return;
+  }
+
  const pkgSet = new Set(packages.map((p) => `${p.name}-${p.version}.crate`));

  // `.cargo/registry/cache`
@@ -181,10 +191,10 @@ const ONE_WEEK = 7 * 24 * 3600 * 1000;

 /**
 * Removes all files or directories in `dirName` matching some criteria.
- * 
+ *
 * When the `checkTimestamp` flag is set, this will also remove anything older
 * than one week.
- * 
+ *
 * Otherwise, it will remove everything that does not match any string in the
 * `keepPrefix` set.
 * The matching strips and trailing `-$hash` suffix.
--- a/src/config.ts
+++ b/src/config.ts
@@ -1,20 +1,21 @@
 import * as core from "@actions/core";
 import * as glob from "@actions/glob";
+import * as toml from "toml";
 import crypto from "crypto";
 import fs from "fs";
+import fs_promises from "fs/promises";
 import os from "os";
 import path from "path";

 import { getCmdOutput } from "./utils";
 import { Workspace } from "./workspace";
+import { getCargoBins } from "./cleanup";

 const HOME = os.homedir();
 export const CARGO_HOME = process.env.CARGO_HOME || path.join(HOME, ".cargo");

-const STATE_LOCKFILE_HASH = "RUST_CACHE_LOCKFILE_HASH";
-const STATE_LOCKFILES = "RUST_CACHE_LOCKFILES";
-export const STATE_BINS = "RUST_CACHE_BINS";
-export const STATE_KEY = "RUST_CACHE_KEY";
+const STATE_CONFIG = "RUST_CACHE_CONFIG";
+const HASH_LENGTH = 8;

 export class CacheConfig {
  /** All the paths we want to cache */
@@ -27,6 +28,9 @@ export class CacheConfig {
  /** The workspace configurations */
  public workspaces: Array<Workspace> = [];

+  /** The cargo binaries present during main step */
+  public cargoBins: Array<string> = [];
+
  /** The prefix portion of the cache key */
  private keyPrefix = "";
  /** The rust version considered for the cache key */
@@ -50,7 +54,7 @@ export class CacheConfig {
    // This uses either the `shared-key` input,
    // or the `key` input combined with the `job` key.

-    let key = core.getInput("prefix-key");
+    let key = core.getInput("prefix-key") || "v0-rust";

    const sharedKey = core.getInput("shared-key");
    if (sharedKey) {
@@ -103,43 +107,14 @@ export class CacheConfig {
    }

    self.keyEnvs = keyEnvs;
-    key += `-${hasher.digest("hex")}`;
+
+    key += `-${digest(hasher)}`;

    self.restoreKey = key;

    // Construct the lockfiles portion of the key:
    // This considers all the files found via globbing for various manifests
    // and lockfiles.
-    // This part is computed in the "pre"/"restore" part of the job and persisted
-    // into the `state`. That state is loaded in the "post"/"save" part of the
-    // job so we have consistent values even though the "main" actions run
-    // might create/overwrite lockfiles.
-
-    let lockHash = core.getState(STATE_LOCKFILE_HASH);
-    let keyFiles: Array<string> = JSON.parse(core.getState(STATE_LOCKFILES) || "[]");
-
-    if (!lockHash) {
-      const globber = await glob.create("**/Cargo.toml\n**/Cargo.lock\nrust-toolchain\nrust-toolchain.toml", {
-        followSymbolicLinks: false,
-      });
-      keyFiles = await globber.glob();
-      keyFiles.sort((a, b) => a.localeCompare(b));
-
-      hasher = crypto.createHash("sha1");
-      for (const file of keyFiles) {
-        for await (const chunk of fs.createReadStream(file)) {
-          hasher.update(chunk);
-        }
-      }
-      lockHash = hasher.digest("hex");
-
-      core.saveState(STATE_LOCKFILE_HASH, lockHash);
-      core.saveState(STATE_LOCKFILES, JSON.stringify(keyFiles));
-    }
-
-    self.keyFiles = keyFiles;
-    key += `-${lockHash}`;
-    self.cacheKey = key;

    // Constructs the workspace config and paths to restore:
    // The workspaces are given using a `$workspace -> $target` syntax.
@@ -154,20 +129,143 @@ export class CacheConfig {
    }
    self.workspaces = workspaces;

+    let keyFiles = await globFiles(".cargo/config.toml\nrust-toolchain\nrust-toolchain.toml");
+    const parsedKeyFiles = []; // keyFiles that are parsed, pre-processed and hashed
+
+    hasher = crypto.createHash("sha1");
+
+    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 cargo_manifests = sort_and_uniq(await globFiles(`${root}/**/Cargo.toml`));
+
+      for (const cargo_manifest of cargo_manifests) {
+        try {
+          const content = await fs_promises.readFile(cargo_manifest, { encoding: 'utf8' });
+          const parsed = toml.parse(content);
+
+          if ("package" in parsed) {
+            const pack = parsed.package;
+            if ("version" in pack) {
+              pack.version = "0.0.0";
+            }
+          }
+
+          for (const prefix of ["", "build-", "dev-"]) {
+            const section_name = `${prefix}dependencies`;
+            if (!(section_name in parsed)) {
+              continue;
+            }
+            const deps = parsed[section_name];
+
+            for (const key of Object.keys(deps)) {
+              const dep = deps[key];
+
+              if ("path" in dep) {
+                dep.version = '0.0.0'
+              }
+            }
+          }
+
+          hasher.update(JSON.stringify(parsed));
+
+          parsedKeyFiles.push(cargo_manifest);
+        } catch (_e) { // Fallback to caching them as regular file
+          keyFiles.push(cargo_manifest);
+        }
+      }
+
+      const cargo_locks = sort_and_uniq(await globFiles(`${root}/**/Cargo.lock`));
+
+      for (const cargo_lock of cargo_locks) {
+        try {
+          const content = await fs_promises.readFile(cargo_lock, { encoding: 'utf8' });
+          const parsed = toml.parse(content);
+
+          if (parsed.version !== 3 || !("package" in parsed)) {
+            // Fallback to caching them as regular file since this action
+            // can only handle Cargo.lock format version 3
+            keyFiles.push(cargo_lock);
+            continue;
+          }
+
+          // Package without `[[package]].source` and `[[package]].checksum`
+          // are the one with `path = "..."` to crates within the workspace.
+          const packages = parsed.package.filter((p: any) => {
+            "source" in p || "checksum" in p
+          });
+
+          hasher.update(JSON.stringify(packages));
+
+          parsedKeyFiles.push(cargo_lock);
+        } catch (_e) { // Fallback to caching them as regular file
+          keyFiles.push(cargo_lock);
+        }
+      }
+    }
+    keyFiles = sort_and_uniq(keyFiles);
+
+    for (const file of keyFiles) {
+      for await (const chunk of fs.createReadStream(file)) {
+        hasher.update(chunk);
+      }
+    }
+
+    let lockHash = digest(hasher);
+
+    keyFiles.push(...parsedKeyFiles);
+    self.keyFiles = sort_and_uniq(keyFiles);
+
+    key += `-${lockHash}`;
+    self.cacheKey = key;
+
    self.cachePaths = [CARGO_HOME];
-    const cacheTargets = core.getInput("cache-targets").toLowerCase();
+    const cacheTargets = core.getInput("cache-targets").toLowerCase() || "true";
    if (cacheTargets === "true") {
      self.cachePaths.push(...workspaces.map((ws) => ws.target));
    }

    const cacheDirectories = core.getInput("cache-directories");
-    for (const dir of cacheDirectories.trim().split("\n")) {
+    for (const dir of cacheDirectories.trim().split(/\s+/).filter(Boolean)) {
      self.cachePaths.push(dir);
    }

+    const bins = await getCargoBins();
+    self.cargoBins = Array.from(bins.values());
+
    return self;
  }

+  /**
+   * Reads and returns the cache config from the action `state`.
+   *
+   * @throws {Error} if the state is not present.
+   * @returns {CacheConfig} the configuration.
+   * @see {@link CacheConfig#saveState}
+   * @see {@link CacheConfig#new}
+   */
+  static fromState(): CacheConfig {
+    const source = core.getState(STATE_CONFIG);
+    if (!source) {
+      throw new Error("Cache configuration not found in state");
+    }
+
+    const self = new CacheConfig();
+    Object.assign(self, JSON.parse(source));
+    self.workspaces = self.workspaces
+      .map((w: any) => new Workspace(w.root, w.target));
+
+    return self;
+  }
+
+  /**
+   * Prints the configuration to the action log.
+   */
  printInfo() {
    core.startGroup("Cache Configuration");
    core.info(`Workspaces:`);
@@ -195,6 +293,33 @@ export class CacheConfig {
    }
    core.endGroup();
  }
+
+  /**
+   * Saves the configuration to the state store.
+   * This is used to restore the configuration in the post action.
+   */
+  saveState() {
+    core.saveState(STATE_CONFIG, this);
+  }
+}
+
+/**
+ * Checks if the cache is up to date.
+ *
+ * @returns `true` if the cache is up to date, `false` otherwise.
+ */
+export function isCacheUpToDate(): boolean {
+  return core.getState(STATE_CONFIG) === "";
+}
+
+/**
+ * Returns a hex digest of the given hasher truncated to `HASH_LENGTH`.
+ *
+ * @param hasher The hasher to digest.
+ * @returns The hex digest.
+ */
+function digest(hasher: crypto.Hash): string {
+  return hasher.digest("hex").substring(0, HASH_LENGTH);
 }

 interface RustVersion {
@@ -212,3 +337,33 @@ async function getRustVersion(): Promise<RustVersion> {
    .filter((s) => s.length === 2);
  return Object.fromEntries(splits);
 }
+
+async function globFiles(pattern: string): Promise<string[]> {
+  const globber = await glob.create(pattern, {
+    followSymbolicLinks: false,
+  });
+  // 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.
+  return (await globber.glob()).filter(file => fs.statSync(file).isFile());
+}
+
+function sort_and_uniq(a: string[]) {
+    return a
+      .sort((a, b) => a.localeCompare(b))
+      .reduce(
+        (accumulator: string[], currentValue: string) => {
+          const len = accumulator.length;
+          // If accumulator is empty or its last element != currentValue
+          // Since array is already sorted, elements with the same value
+          // are grouped together to be continugous in space.
+          //
+          // If currentValue != last element, then it must be unique.
+          if (len == 0 || accumulator[len - 1].localeCompare(currentValue) != 0) {
+            accumulator.push(currentValue);
+          }
+          return accumulator;
+        },
+        []
+      );
+}
--- a/src/restore.ts
+++ b/src/restore.ts
@@ -1,13 +1,13 @@
 import * as cache from "@actions/cache";
 import * as core from "@actions/core";

-import { cleanTargetDir, getCargoBins } from "./cleanup";
-import { CacheConfig, STATE_BINS, STATE_KEY } from "./config";
+import { cleanTargetDir } from "./cleanup";
+import { CacheConfig } from "./config";

 process.on("uncaughtException", (e) => {
-  core.info(`[warning] ${e.message}`);
+  core.error(e.message);
  if (e.stack) {
-    core.info(e.stack);
+    core.error(e.stack);
  }
 });

@@ -29,35 +29,38 @@ async function run() {
    config.printInfo();
    core.info("");

-    const bins = await getCargoBins();
-    core.saveState(STATE_BINS, JSON.stringify([...bins]));
-
    core.info(`... Restoring cache ...`);
    const key = config.cacheKey;
-    const restoreKey = await cache.restoreCache(config.cachePaths, key, [config.restoreKey]);
+    // Pass a copy of cachePaths to avoid mutating the original array as reported by:
+    // https://github.com/actions/toolkit/pull/1378
+    // TODO: remove this once the underlying bug is fixed.
+    const restoreKey = await cache.restoreCache(config.cachePaths.slice(), key, [config.restoreKey]);
    if (restoreKey) {
-      core.info(`Restored from cache key "${restoreKey}".`);
-      core.saveState(STATE_KEY, restoreKey);
-
-      if (restoreKey !== key) {
+      const match = restoreKey === key;
+      core.info(`Restored from cache key "${restoreKey}" full match: ${match}.`);
+      if (!match) {
        // pre-clean the target directory on cache mismatch
        for (const workspace of config.workspaces) {
          try {
            await cleanTargetDir(workspace.target, [], true);
          } catch {}
        }
+
+        // We restored the cache but it is not a full match.
+        config.saveState();
      }

-      setCacheHitOutput(restoreKey === key);
+      setCacheHitOutput(match);
    } else {
      core.info("No cache found.");
+      config.saveState();

      setCacheHitOutput(false);
    }
  } catch (e) {
    setCacheHitOutput(false);

-    core.info(`[warning] ${(e as any).stack}`);
+    core.error(`${(e as any).stack}`);
  }
 }

--- a/src/save.ts
+++ b/src/save.ts
@@ -3,30 +3,32 @@ import * as core from "@actions/core";
 import * as exec from "@actions/exec";

 import { cleanBin, cleanGit, cleanRegistry, cleanTargetDir } from "./cleanup";
-import { CacheConfig, STATE_KEY } from "./config";
+import { CacheConfig, isCacheUpToDate } from "./config";

 process.on("uncaughtException", (e) => {
-  core.info(`[warning] ${e.message}`);
+  core.error(e.message);
  if (e.stack) {
-    core.info(e.stack);
+    core.error(e.stack);
  }
 });

 async function run() {
-  if (!cache.isFeatureAvailable()) {
+  const save = core.getInput("save-if").toLowerCase() || "true";
+
+  if (!(cache.isFeatureAvailable() && save === "true")) {
    return;
  }

  try {
-    const config = await CacheConfig.new();
-    config.printInfo();
-    core.info("");
-
-    if (core.getState(STATE_KEY) === config.cacheKey) {
+    if (isCacheUpToDate()) {
      core.info(`Cache up-to-date.`);
      return;
    }

+    const config = CacheConfig.fromState();
+    config.printInfo();
+    core.info("");
+
    // TODO: remove this once https://github.com/actions/toolkit/pull/553 lands
    await macOsWorkaround();

@@ -38,35 +40,39 @@ async function run() {
        core.info(`... Cleaning ${workspace.target} ...`);
        await cleanTargetDir(workspace.target, packages);
      } catch (e) {
-        core.info(`[warning] ${(e as any).stack}`);
+        core.error(`${(e as any).stack}`);
      }
    }

    try {
-      core.info(`... Cleaning cargo registry ...`);
-      await cleanRegistry(allPackages);
+      const crates = core.getInput("cache-all-crates").toLowerCase() || "false"
+      core.info(`... Cleaning cargo registry cache-all-crates: ${crates} ...`);
+      await cleanRegistry(allPackages, crates !== "true");
    } catch (e) {
-      core.info(`[warning] ${(e as any).stack}`);
+      core.error(`${(e as any).stack}`);
    }

    try {
      core.info(`... Cleaning cargo/bin ...`);
-      await cleanBin();
+      await cleanBin(config.cargoBins);
    } catch (e) {
-      core.info(`[warning] ${(e as any).stack}`);
+      core.error(`${(e as any).stack}`);
    }

    try {
      core.info(`... Cleaning cargo git cache ...`);
      await cleanGit(allPackages);
    } catch (e) {
-      core.info(`[warning] ${(e as any).stack}`);
+      core.error(`${(e as any).stack}`);
    }

    core.info(`... Saving cache ...`);
-    await cache.saveCache(config.cachePaths, config.cacheKey);
+    // Pass a copy of cachePaths to avoid mutating the original array as reported by:
+    // https://github.com/actions/toolkit/pull/1378
+    // TODO: remove this once the underlying bug is fixed.
+    await cache.saveCache(config.cachePaths.slice(), config.cacheKey);
  } catch (e) {
-    core.info(`[warning] ${(e as any).stack}`);
+    core.error(`${(e as any).stack}`);
  }
 }

--- a/src/utils.ts
+++ b/src/utils.ts
@@ -22,8 +22,8 @@ export async function getCmdOutput(
      ...options,
    });
  } catch (e) {
-    core.info(`[warning] Command failed: ${cmd} ${args.join(" ")}`);
-    core.info(`[warning] ${stderr}`);
+    core.error(`Command failed: ${cmd} ${args.join(" ")}`);
+    core.error(stderr);
    throw e;
  }
  return stdout;
Author	SHA1	Message	Date
Arpad Borsos	dd05243424	2.5.1	2023-07-03 19:38:11 +02:00
Arpad Borsos	65dbc54a5d	update changelog	2023-07-03 19:38:01 +02:00
Jiahao XU	be7377e68e	fix `src/config.ts`: Remove `sort_object` (#152 ) Fixed #151 I've tried running manually load and parse `Cargo.lock` and it runs fine until `sort_object` is called. Since `Cargo.lock` is auto-generated and usually sorted, I think there is no need for sorting. Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>	2023-06-27 08:55:56 +02:00
Arpad Borsos	2656b87321	2.5.0	2023-06-18 15:32:29 +02:00
Jiahao XU	715970feed	feat: Add hash of `.cargo/config.toml` to key (#149 ) Also: - Add and use `sort_and_uniq` to make sure `globFile` resulting and `keyFiles` does not contain duplicates. - Only returns regular file in function `globFile` Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>	2023-06-18 10:12:25 +02:00
Jiahao XU	3d4000164d	feat: Rm workspace crates version before caching (#147 ) Fixed #146 - Set all `package.version` in `Cargo.toml` to `0.0.0` - Set `{build-, dev-, }dependencies` of workspace crates to `0.0.0` - Remove workspace crates from `Cargo.lock` before caching - Sort all toml objects before hashing them as json Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>	2023-06-18 09:29:44 +02:00
Arpad Borsos	988c164c3d	2.4.0	2023-05-21 19:36:24 +02:00
Steven Hartland	bb80d0f127	chore: use 8 character hash components (#143 ) Use 8 character hash components to reduce the key length, making it more readable. Fixes #97	2023-05-19 20:30:37 +02:00
Steven Hartland	ad97570a01	fix: cache key stability (#142 ) Ensure consistency of main and post configuration by storing and restoring it from state, which in turn ensures cache key stability. Also: * Fixed some typos. * Use core.error for logging errors. * Fix inverted condition on cache-all-crates. Reverts: #138 Fixes #140	2023-05-18 22:48:40 +02:00
Arpad Borsos	060bda31e0	2.3.0	2023-05-13 12:16:43 +02:00
Arpad Borsos	865fd1f6db	"update dependencies and changelog"	2023-05-13 12:16:26 +02:00
Steven Hartland	7c7e41ab01	chore: changelog v2.3.0 (#139 ) Update CHANGELOG for v2.3.0 release.	2023-05-13 12:13:40 +02:00
Steven Hartland	68aeeba167	chore: use linefix to ensure platform line endings (#135 ) Use linefix so that when developing changes the results of npm run prepare always have unix line endings so git diff commands don't show line ending changes for the ncc generated files.	2023-05-11 23:19:46 +02:00
Steven Hartland	def0926359	feat: add option to cache all crates (#137 ) Add cache-all-crates option which allows all crates to be cached instead of just the dependency crates. This is useful when additional crates are required for CI tooling.	2023-05-11 23:15:09 +02:00
Steven Hartland	827c240e23	fix: cache key dependency on installed packages (#138 ) Add the installed packages to the environment element of the cache key so that CI tooling is considered. This ensures that rust CI tooling is cached correctly when changes occur. Prior to this a manual key change or cache expiry would need to occur before CI tools were correctly cached.	2023-05-11 23:12:12 +02:00
Steven Hartland	5e9fae966f	fix: cache restore failures (#136 ) Fix cache restore failures to to upstream bug. Fixes #119	2023-05-11 09:01:27 +02:00
Arpad Borsos	127a0e9568	"update dependencies and rebuild"	2023-05-02 22:03:29 +02:00
Felix Riegger	99229f978c	Fix EISDIR error due to globbed directories (#1 ) (#132 )	2023-05-02 21:49:27 +02:00
Arpad Borsos	6fd3edff69	2.2.1	2023-02-24 10:59:55 +01:00
Arpad Borsos	a1c019f71a	update dependencies and rebuild	2023-02-24 10:58:39 +01:00
Jongwoo Han	664ce0090f	chore: Create check-dist.yml (#96 )	2022-12-17 10:01:41 +01:00
Arpad Borsos	359a70e43a	2.2.0	2022-11-09 20:14:41 +01:00
Lucas Fernandes Nogueira	ecee04e7b3	feat: add save-if option, closes #66 (#91 )	2022-11-06 19:15:00 +01:00
Arpad Borsos	b894d59a8d	2.1.0	2022-11-06 10:06:04 +01:00
Arpad Borsos	e78327dd9e	small code style improvements, README and CHANGELOG updates	2022-11-06 09:50:33 +01:00
Lucas Fernandes Nogueira	ccdddcc049	only hash Cargo.toml/Cargo.lock that belong to a configured workspace (#90 )	2022-11-05 21:18:04 +01:00