Merge pull request #380 from Swatinem/dependabot/github_actions/actions-8ff5872ddf

Bump the actions group with 2 updates

.github/dependabot.yaml

@@ -0,0 +1,50 @@
+# https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/optimizing-pr-creation-version-updates#setting-up-a-cooldown-period-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: cargo
+    directories:
+      - tests
+      - tests/wasm-workspace
+    schedule:
+      interval: weekly
+    # https://docs.github.com/en/code-security/dependabot/working-with-dependabot/dependabot-options-reference#groups--
+    # 1 PR per week and group
+    groups:
+      cargo-major:
+        update-types: ["major"]
+      cargo-minor:
+        update-types: ["minor"]
+      cargo-patch:
+        update-types: ["patch"]
+  - package-ecosystem: github-actions
+    directory: /
+    schedule:
+      interval: weekly
+    groups:
+      actions:
+        # Combine all images of the last week
+        patterns: ["*"]
+  - package-ecosystem: npm
+    directory: /
+    schedule:
+      interval: weekly
+    groups:
+      prd-major:
+        dependency-type: "production"
+        update-types: ["major"]
+      prd-minor:
+        dependency-type: "production"
+        update-types: ["minor"]
+      prd-patch:
+        dependency-type: "production"
+        update-types: ["patch"]
+      dev-major:
+        dependency-type: "development"
+        update-types: ["major"]
+      dev-minor:
+        dependency-type: "development"
+        update-types: ["minor"]
+      dev-patch:
+        dependency-type: "development"
+        update-types: ["patch"]

.github/workflows/binstall.yml

@@ -0,0 +1,34 @@
+name: binstall
+
+on: [push, pull_request]
+
+permissions: {}
+
+jobs:
+  binstall:
+    if: github.repository == 'Swatinem/rust-cache'
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, macos-latest, windows-latest]
+
+    name: Test `cargo binstall` on ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+
+    env:
+      CARGO_TERM_COLOR: always
+
+    steps:
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        with:
+          persist-credentials: false
+
+      - run: rustup toolchain install stable --profile minimal --no-self-update
+
+      - uses: cargo-bins/cargo-binstall@e00d2c94cc0067b77737821097a62d91c0301baa # v1.21.1
+
+      - uses: ./
+
+      - run: cargo binstall -y cargo-deny
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/check-dist.yml

@@ -0,0 +1,50 @@
+name: check dist/
+
+on:
+  push:
+    branches:
+      - master
+    paths-ignore:
+      - "**.md"
+  pull_request:
+    paths-ignore:
+      - "**.md"
+  workflow_dispatch:
+
+permissions: {}
+
+jobs:
+  check-dist:
+    if: github.repository == 'Swatinem/rust-cache'
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        with:
+          persist-credentials: false
+
+      - name: Setup Node.js 24.x
+        uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
+        with:
+          node-version: 24.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@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
+        if: ${{ failure() && steps.diff.conclusion == 'failure' }}
+        with:
+          name: dist
+          path: dist/

.github/workflows/coverage.yml

@@ -0,0 +1,37 @@
+name: coverage
+
+on: [push, pull_request]
+
+permissions: {}
+
+jobs:
+  coverage:
+    if: github.repository == 'Swatinem/rust-cache'
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, macos-latest, windows-latest]
+
+    name: Test `cargo-llvm-cov` on ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+
+    env:
+      CARGO_TERM_COLOR: always
+
+    steps:
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        with:
+          persist-credentials: false
+
+      - run: rustup toolchain install stable --profile minimal --component llvm-tools-preview --no-self-update
+
+      - uses: taiki-e/install-action@82cd3e7658a6f96c86c0234aeeda1748937cb0a1 # v2.85.13
+        with:
+          tool: cargo-llvm-cov
+
+      - uses: ./
+        with:
+          workspaces: tests
+
+      - run: cargo llvm-cov --all-features --workspace
+        working-directory: tests

.github/workflows/dependabot.yml

@@ -0,0 +1,65 @@
+# https://docs.github.com/en/code-security/dependabot/working-with-dependabot/automating-dependabot-with-github-actions#enabling-automerge-on-a-pull-request
+
+name: Dependabot Automation
+on: pull_request
+
+permissions: {}
+
+jobs:
+  automerge:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write # for pushing commits
+      pull-requests: write # for merging PRs
+    if: github.event.pull_request.user.login == 'dependabot[bot]' && github.repository == 'Swatinem/rust-cache'
+    steps:
+      - name: Fetch metadata
+        id: metadata
+        uses: dependabot/fetch-metadata@25dd0e34f4fe68f24cc83900b1fe3fe149efef98 # v3.1.0
+        with:
+          github-token: "${{ secrets.GITHUB_TOKEN }}"
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        with:
+          fetch-depth: 2
+          persist-credentials: false
+        if: steps.metadata.outputs.update-type == 'version-update:semver-patch'
+      - name: Check if package-lock.json has been changed
+        if: steps.metadata.outputs.update-type == 'version-update:semver-patch'
+        id: npm
+        env:
+          PR_URL: ${{github.event.pull_request.html_url}}
+          GH_TOKEN: ${{secrets.GITHUB_TOKEN}}
+        run: |
+          if ! git diff --quiet HEAD~1.. -- package-lock.json; then
+            echo "changed=true" >> $GITHUB_OUTPUT
+            echo "changed=true, checking out $PR_URL to allow amend"
+            gh pr checkout "$PR_URL"
+          fi
+      - name: Setup node if necessary
+        if: steps.npm.outputs.changed != ''
+        uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
+        with:
+          node-version: 24.x
+          cache: npm
+      - name: Re-generate and commit dist/ if changed
+        id: amend
+        if: steps.npm.outputs.changed != ''
+        run: |
+          npm ci
+          npm run prepare
+          if ! git diff --quiet dist/*/index.js; then
+            echo "dist/ changed, amending last commit"
+            export $(git log -1 --pretty=format:'GIT_COMMITTER_NAME=%cn GIT_COMMITTER_EMAIL=%ce GIT_AUTHOR_NAME=%an GIT_AUTHOR_EMAIL=%ae')
+            git fetch --unshallow
+            echo "Before amend:" && git show --name-only --pretty=
+            git commit --amend --no-edit --no-reset-author -- dist/*/index.js
+            echo "After amend:" && git show --name-only --pretty=
+            git push --force-with-lease origin HEAD
+            echo "changed=true" >> $GITHUB_OUTPUT
+          fi
+      - name: Auto-merge Patch PRs
+        if: steps.metadata.outputs.update-type == 'version-update:semver-patch'
+        run: gh pr merge --auto --merge "$PR_URL"
+        env:
+          PR_URL: ${{github.event.pull_request.html_url}}
+          GH_TOKEN: ${{secrets.GITHUB_TOKEN}}

.github/workflows/git-registry.yml

@@ -0,0 +1,36 @@
+name: git-registry
+
+on: [push, pull_request]
+
+permissions: {}
+
+jobs:
+  git-registry:
+    if: github.repository == 'Swatinem/rust-cache'
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, macos-latest, windows-latest]
+
+    name: Test cargo "git" registry on ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+
+    env:
+      CARGO_TERM_COLOR: always
+      CARGO_REGISTRIES_CRATES_IO_PROTOCOL: git
+
+    steps:
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        with:
+          persist-credentials: false
+
+      - run: rustup toolchain install stable --profile minimal --no-self-update
+
+      - uses: ./
+        with:
+          workspaces: tests
+
+      - run: |
+          cargo check
+          cargo test
+        working-directory: tests

.github/workflows/install.yml

@@ -0,0 +1,30 @@
+name: install
+
+on: [push, pull_request]
+
+permissions: {}
+
+jobs:
+  install:
+    if: github.repository == 'Swatinem/rust-cache'
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, macos-latest, windows-latest]
+
+    name: Test `cargo install` on ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+
+    env:
+      CARGO_TERM_COLOR: always
+
+    steps:
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        with:
+          persist-credentials: false
+
+      - run: rustup toolchain install stable --profile minimal --no-self-update
+
+      - uses: ./
+
+      - run: cargo install cargo-deny --locked

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

@@ -0,0 +1,74 @@
+name: multi-job-cache
+
+on: [push, pull_request]
+
+permissions: {}
+
+jobs:
+  multi-job-cache-1:
+    if: github.repository == 'Swatinem/rust-cache'
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, macos-latest, windows-latest]
+
+    name: Test multi-job cache (1) on ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+
+    env:
+      CARGO_TERM_COLOR: always
+
+    steps:
+      - name: checkout
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        with:
+          persist-credentials: false
+
+      - name: install rust toolchain
+        run: rustup toolchain install stable --profile minimal --target wasm32-unknown-unknown --no-self-update
+
+      - name: cache
+        uses: ./
+        with:
+          workspaces: |
+            tests
+          add-job-id-key: "false"
+          add-rust-environment-hash-key: "false"
+
+      - name: cargo check (tests)
+        working-directory: tests
+        run: cargo check
+
+  multi-job-cache-2:
+    if: github.repository == 'Swatinem/rust-cache'
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, macos-latest, windows-latest]
+
+    name: Test multi-job cache (2) on ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+
+    env:
+      CARGO_TERM_COLOR: always
+
+    steps:
+      - name: checkout
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        with:
+          persist-credentials: false
+
+      - name: install rust toolchain
+        run: rustup toolchain install stable --profile minimal --target wasm32-unknown-unknown --no-self-update
+
+      - name: cache
+        uses: ./
+        with:
+          workspaces: |
+            tests/wasm-workspace
+          add-job-id-key: "false"
+          add-rust-environment-hash-key: "false"
+
+      - name: cargo check (tests/wasm-workspace)
+        working-directory: tests/wasm-workspace
+        run: cargo check

.github/workflows/nix.yml

@@ -0,0 +1,33 @@
+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@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        with:
+          persist-credentials: false
+
+      - uses: cachix/install-nix-action@13d8dd58da0234aa297dedd986986ccb8e7f3e24 # v31.11.1
+
+      - 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/save-restore.yml

@@ -0,0 +1,70 @@
+name: save-restore
+
+on: [push, pull_request]
+
+permissions: {}
+
+jobs:
+  save:
+    if: github.repository == 'Swatinem/rust-cache'
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, macos-latest, windows-latest]
+
+    name: Save a new cache on ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+
+    env:
+      CARGO_TERM_COLOR: always
+
+    steps:
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        with:
+          persist-credentials: false
+
+      - run: rustup toolchain install stable --profile minimal --no-self-update
+
+      # Use a per-run key so this job always exercises the post-step save path.
+      - uses: ./
+        with:
+          workspaces: tests
+          shared-key: save-restore-${{ matrix.os }}-${{ github.run_id }}-${{ github.run_attempt }}
+
+      - run: cargo check
+        working-directory: tests
+
+  restore:
+    if: github.repository == 'Swatinem/rust-cache'
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, macos-latest, windows-latest]
+
+    name: Restore the newly saved cache on ${{ matrix.os }}
+    needs: save
+    runs-on: ${{ matrix.os }}
+
+    env:
+      CARGO_TERM_COLOR: always
+
+    steps:
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        with:
+          persist-credentials: false
+
+      - run: rustup toolchain install stable --profile minimal --no-self-update
+
+      - id: cache
+        uses: ./
+        with:
+          workspaces: tests
+          shared-key: save-restore-${{ matrix.os }}-${{ github.run_id }}-${{ github.run_attempt }}
+          save-if: "false"
+
+      - name: Verify exact cache hit
+        if: steps.cache.outputs.cache-hit != 'true'
+        shell: bash
+        run: |
+          echo "The cache created by the save job could not be restored." >&2
+          exit 1

.github/workflows/selftest.yml

@@ -1,29 +0,0 @@
-name: CI
-
-on: [push, pull_request]
-
-jobs:
-  selftest:
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ubuntu-latest, macos-latest, windows-latest]
-
-    name: Test Action on ${{ matrix.os }}
-    runs-on: ${{ matrix.os }}
-
-    steps:
-      - uses: actions/checkout@v2
-
-      - uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-          profile: minimal
-          override: true
-
-      - uses: ./
-
-      - run: |
-          cargo install cargo-deny --locked
-          cargo check
-          cargo test

.github/workflows/simple.yml

@@ -0,0 +1,36 @@
+name: simple
+
+on: [push, pull_request]
+
+permissions: {}
+
+jobs:
+  simple:
+    if: github.repository == 'Swatinem/rust-cache'
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, macos-latest, windows-latest]
+
+    name: Test `cargo check/test/build` on ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+
+    env:
+      CARGO_TERM_COLOR: always
+
+    steps:
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        with:
+          persist-credentials: false
+
+      - run: rustup toolchain install stable --profile minimal --no-self-update
+
+      - uses: ./
+        with:
+          workspaces: tests
+
+      - run: |
+          cargo check
+          cargo test
+          cargo build --release
+        working-directory: tests

.github/workflows/target-dir.yml

@@ -0,0 +1,34 @@
+name: target-dir
+
+on: [push, pull_request]
+
+permissions: {}
+
+jobs:
+  target-dir:
+    if: github.repository == 'Swatinem/rust-cache'
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, macos-latest, windows-latest]
+
+    name: Test custom target-dir on ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+
+    env:
+      CARGO_TERM_COLOR: always
+
+    steps:
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        with:
+          persist-credentials: false
+
+      - run: rustup toolchain install stable --profile minimal --no-self-update
+
+      # the `workspaces` option has the format `$workspace -> $target-dir`
+      # and the `$target-dir` is relative to the `$workspace`.
+      - uses: ./
+        with:
+          workspaces: tests -> ../custom-target-dir
+
+      - run: cargo test --manifest-path tests/Cargo.toml --target-dir custom-target-dir

.github/workflows/warpbuild.yml

@@ -0,0 +1,37 @@
+name: warpbuild
+
+on: [push, pull_request]
+
+permissions: {}
+
+jobs:
+  warpbuild:
+    if: github.repository == 'Swatinem/rust-cache'
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, macos-latest, windows-latest]
+
+    name: Test warpbuild provider on ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+
+    env:
+      CARGO_TERM_COLOR: always
+
+    steps:
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        with:
+          persist-credentials: false
+
+      - run: rustup toolchain install stable --profile minimal --no-self-update
+
+      - uses: ./
+        with:
+          workspaces: tests
+          cache-provider: warpbuild
+
+      - run: |
+          cargo check
+          cargo test
+          cargo build --release
+        working-directory: tests

.github/workflows/workspaces.yml

@@ -0,0 +1,40 @@
+name: workspaces
+
+on: [push, pull_request]
+
+permissions: {}
+
+jobs:
+  workspaces:
+    if: github.repository == 'Swatinem/rust-cache'
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, macos-latest, windows-latest]
+
+    name: Test multiple workspaces on ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+
+    env:
+      CARGO_TERM_COLOR: always
+
+    steps:
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        with:
+          persist-credentials: false
+
+      - run: rustup toolchain install stable --profile minimal --target wasm32-unknown-unknown --no-self-update
+
+      - uses: ./
+        with:
+          workspaces: |
+            tests
+            tests/wasm-workspace
+
+      - name: cargo check (tests)
+        working-directory: tests
+        run: cargo check
+
+      - name: cargo check (tests/wasm-workspace)
+        working-directory: tests/wasm-workspace
+        run: cargo check

.github/workflows/zizmor.yml

@@ -0,0 +1,24 @@
+name: GitHub Actions Security Analysis with zizmor 🌈
+
+on:
+  push:
+    branches: ["main"]
+  pull_request:
+    branches: ["**"]
+
+permissions: {}
+
+jobs:
+  zizmor:
+    name: Run zizmor 🌈
+    runs-on: ubuntu-latest
+    permissions:
+      security-events: write # for uploading results to the Security tab
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        with:
+          persist-credentials: false
+
+      - name: Run zizmor 🌈
+        uses: zizmorcore/zizmor-action@3dc1ecc9bcb9e94e9b2c709687979e1298497054 # v0.6.2

.gitignore

@@ -1,2 +1,10 @@
-node_modules
-/target
+node_modules/
+target/
+src/*.js
+.build
+
+# Editors
+.idea/
+
+# Mac
+.DS_Store

CHANGELOG.md

@@ -1,5 +1,149 @@
 # Changelog
 
+## 2.9.2
+
+- Fix `credentials.toml` cleanup
+- Improvements to cleanup, preserving more valid targets
+- Improvements to `cargo install` handling
+- Correctly sort/dedupe Rust versions
+
+## 2.9.1
+
+- Fix regression in hash calculation
+
+## 2.9.0
+
+- Update to `node24`
+- Support running from within a `nix` shell
+- Consider all installed toolchains for cache key
+- Use case-insensitive comparison to determine exact cache hit
+
+## 2.8.2
+
+- Don't overwrite env for cargo-metadata call
+
+## 2.8.1
+
+- Set empty `CARGO_ENCODED_RUSTFLAGS` when retrieving metadata
+- Various dependency updates
+
+## 2.8.0
+
+- Add support for `warpbuild` cache provider
+- Add new `cache-workspace-crates` feature
+
+## 2.7.8
+
+- Include CPU arch in the cache key
+
+## 2.7.7
+
+- Also cache `cargo install` metadata
+
+## 2.7.6
+
+- Allow opting out of caching $CARGO_HOME/bin
+- Add runner OS in cache key
+- Adds an option to do lookup-only of the cache
+
+## 2.7.5
+
+- Support Cargo.lock format cargo-lock v4
+- Only run macOsWorkaround() on macOS
+
+## 2.7.3
+
+- Work around upstream problem that causes cache saving to hang for minutes.
+
+## 2.7.2
+
+- Only key by `Cargo.toml` and `Cargo.lock` files of workspace members.
+
+## 2.7.1
+
+- Update toml parser to fix parsing errors.
+
+## 2.7.0
+
+- Properly cache `trybuild` tests.
+
+## 2.6.2
+
+- Fix `toml` parsing.
+
+## 2.6.1
+
+- Fix hash contributions of `Cargo.lock`/`Cargo.toml` files.
+
+## 2.6.0
+
+- Add "buildjet" as a second `cache-provider` backend.
+- Clean up sparse registry index.
+- Do not clean up src of `-sys` crates.
+- Remove `.cargo/credentials.toml` before saving.
+
+## 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
+
+- Primarily just updating dependencies to fix GitHub deprecation notices.
+
+## 2.0.0
+
+- The action code was refactored to allow for caching multiple workspaces and
+  different `target` directory layouts.
+- The `working-directory` and `target-dir` input options were replaced by a
+  single `workspaces` option that has the form of `$workspace -> $target`.
+- Support for considering `env-vars` as part of the cache key.
+- The `sharedKey` input option was renamed to `shared-key` for consistency.
+
+## 1.4.0
+
+- Clean both `debug` and `release` target directories.
+
+## 1.3.0
+
+- Use Rust toolchain file as additional cache key.
+- Allow for a configurable target-dir.
+
 ## 1.2.0
 
 - Cache `~/.cargo/bin`.

Cargo.toml

@@ -1,10 +0,0 @@
-[package]
-publish = false
-name = "rust-cache"
-version = "0.1.0"
-authors = ["Arpad Borsos <arpad.borsos@googlemail.com>"]
-edition = "2018"
-
-[dev-dependencies]
-reqwest = "0.11.0"
-actix-web = { git = "https://github.com/actix/actix-web.git", rev = "bd26083f333ecf63e3eb444748250364ce124f5e" }

LICENSE

@@ -0,0 +1,165 @@
+                   GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+  This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+  0. Additional Definitions.
+
+  As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+  "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+  An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+  A "Combined Work" is a work produced by combining or linking an
+Application with the Library.  The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+  The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+  The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+  1. Exception to Section 3 of the GNU GPL.
+
+  You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+  2. Conveying Modified Versions.
+
+  If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+   a) under this License, provided that you make a good faith effort to
+   ensure that, in the event an Application does not supply the
+   function or data, the facility still operates, and performs
+   whatever part of its purpose remains meaningful, or
+
+   b) under the GNU GPL, with none of the additional permissions of
+   this License applicable to that copy.
+
+  3. Object Code Incorporating Material from Library Header Files.
+
+  The object code form of an Application may incorporate material from
+a header file that is part of the Library.  You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+   a) Give prominent notice with each copy of the object code that the
+   Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the object code with a copy of the GNU GPL and this license
+   document.
+
+  4. Combined Works.
+
+  You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+   a) Give prominent notice with each copy of the Combined Work that
+   the Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the Combined Work with a copy of the GNU GPL and this license
+   document.
+
+   c) For a Combined Work that displays copyright notices during
+   execution, include the copyright notice for the Library among
+   these notices, as well as a reference directing the user to the
+   copies of the GNU GPL and this license document.
+
+   d) Do one of the following:
+
+       0) Convey the Minimal Corresponding Source under the terms of this
+       License, and the Corresponding Application Code in a form
+       suitable for, and under terms that permit, the user to
+       recombine or relink the Application with a modified version of
+       the Linked Version to produce a modified Combined Work, in the
+       manner specified by section 6 of the GNU GPL for conveying
+       Corresponding Source.
+
+       1) Use a suitable shared library mechanism for linking with the
+       Library.  A suitable mechanism is one that (a) uses at run time
+       a copy of the Library already present on the user's computer
+       system, and (b) will operate properly with a modified version
+       of the Library that is interface-compatible with the Linked
+       Version.
+
+   e) Provide Installation Information, but only if you would otherwise
+   be required to provide such information under section 6 of the
+   GNU GPL, and only to the extent that such information is
+   necessary to install and execute a modified version of the
+   Combined Work produced by recombining or relinking the
+   Application with a modified version of the Linked Version. (If
+   you use option 4d0, the Installation Information must accompany
+   the Minimal Corresponding Source and Corresponding Application
+   Code. If you use option 4d1, you must provide the Installation
+   Information in the manner specified by section 6 of the GNU GPL
+   for conveying Corresponding Source.)
+
+  5. Combined Libraries.
+
+  You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+   a) Accompany the combined library with a copy of the same work based
+   on the Library, uncombined with any other library facilities,
+   conveyed under the terms of this License.
+
+   b) Give prominent notice with the combined library that part of it
+   is a work based on the Library, and explaining where to find the
+   accompanying uncombined form of the same work.
+
+  6. Revised Versions of the GNU Lesser General Public License.
+
+  The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+  Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+  If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.

README.md

@@ -6,78 +6,209 @@ sensible defaults.
 ## Example usage
 
 ```yaml
-# selecting a toolchain either by action or manual `rustup` calls should happen
-# before the plugin, as it uses the current rustc version as its cache key
-- uses: actions-rs/toolchain@v1
-  with:
-    profile: minimal
-    toolchain: stable
+- uses: actions/checkout@v6
 
-- uses: Swatinem/rust-cache@v1
+# selecting a toolchain either by action or manual `rustup` calls should happen
+# before the plugin, as the cache uses the current rustc version as its cache key
+- run: rustup toolchain install stable --profile minimal
+
+- uses: Swatinem/rust-cache@v2
+  with:
+    # The prefix cache key, this can be changed to start a new cache manually.
+    # default: "v0-rust"
+    prefix-key: ""
+
+    # A cache key that is used instead of the automatic `job`-based key,
+    # and is stable over multiple jobs.
+    # default: empty
+    shared-key: ""
+
+    # An additional cache key that is added alongside the automatic `job`-based
+    # cache key and can be used to further differentiate jobs.
+    # default: empty
+    key: ""
+
+    # If the automatic `job`-based cache key should include the job id.
+    # default: "true"
+    add-job-id-key: ""
+
+    # Whether the a hash of the rust environment should be included in the cache key.
+    # This includes a hash of all Cargo.toml/Cargo.lock files, rust-toolchain files,
+    # and .cargo/config.toml files (if present), as well as the specified 'env-vars'.
+    # default: "true"
+    add-rust-environment-hash-key: ""
+
+    # A whitespace separated list of env-var *prefixes* who's value contributes
+    # to the environment cache key.
+    # The env-vars are matched by *prefix*, so the default `RUST` var will
+    # match all of `RUSTC`, `RUSTUP_*`, `RUSTFLAGS`, `RUSTDOC_*`, etc.
+    # default: "CARGO CC CFLAGS CXX CMAKE RUST"
+    env-vars: ""
+
+    # The cargo workspaces and target directory configuration.
+    # These entries are separated by newlines and have the form
+    # `$workspace -> $target`. The `$target` part is treated as a directory
+    # relative to the `$workspace` and defaults to "target" if not explicitly given.
+    # default: ". -> target"
+    workspaces: ""
+
+    # 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: ""
+
+    # Similar to cache-all-crates.
+    # If `true` the workspace crates will be cached.
+    # Useful if the workspace contains libraries that are only updated sporadically.
+    # default: "false"
+    cache-workspace-crates: ""
+
+    # Determines 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,
+    # or when only runs from `master` should be saved to the cache.
+    # default: "true"
+    save-if: ""
+    # To only cache runs from `master`:
+    save-if: ${{ github.ref == 'refs/heads/master' }}
+
+    # Determines whether the cache should be restored.
+    # If `true` the cache key will be checked and the `cache-hit` output will be set
+    # but the cache itself won't be restored
+    # default: "false"
+    lookup-only: ""
+
+    # Specifies what to use as the backend providing cache
+    # Can be set to "github", or "warpbuild"
+    # default: "github"
+    cache-provider: ""
+
+    # 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}
 ```
 
-## Inputs
-
-: `key`
-An optional key that is added to the automatic cache key.
-
-: `sharedKey`
-An additional key that is stable over multiple jobs.
-
-: `working-directory`
-The working directory the action operates in, is case the cargo project is not
-located in the repo root.
+Further examples are available in the [.github/workflows](./.github/workflows/) directory.
 
 ## Outputs
 
-: `cache-hit`
+**`cache-hit`**
 
 This is a boolean flag that will be set to `true` when there was an exact cache hit.
 
 ## Cache Effectiveness
 
-This action only caches the _dependencies_ of a crate, so is more effective if
+This action only caches the _dependencies_ of a crate, so it is more effective if
 the dependency / own code ratio is higher.
 
-It is also most effective for repositories with a `Cargo.lock` file. Library
+It is also more effective for repositories with a `Cargo.lock` file. Library
 repositories with only a `Cargo.toml` file have limited benefits, as cargo will
 _always_ use the most up-to-date dependency versions, which may not be cached.
 
-Usage with Stable Rust is most effective, as a cache is tied to the Rust version.
-Using it with Nightly Rust is less effective as it will throw away the cache every day.
-
-## Versioning
-
-I use the `v1` branch similar to `master` development, so if you want to have
-a more stable experience, please use a fixed revision or tag.
+Usage with Stable Rust is the most effective, as a cache is tied to the Rust version.
+Using it with Nightly Rust is less effective as it will throw away the cache every day,
+unless a specific nightly build is being pinned.
 
 ## Cache Details
 
-The cache currently caches the following directories:
+This action currently caches the following files/directories:
 
-- `~/.cargo/registry/index`
-- `~/.cargo/registry/cache`
-- `~/.cargo/git`
-- `./target`
+- `~/.cargo` (installed binaries, the cargo registry, cache, and git dependencies)
+- `./target` (build artifacts of dependencies)
 
 This cache is automatically keyed by:
 
-- the github `job`,
-- the rustc release / host / hash, and
-- a hash of the `Cargo.lock` / `Cargo.toml` files.
+- 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 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).
+  - a hash of all `rust-toolchain` / `rust-toolchain.toml` files in the root of the repository (if present).
+  - a hash of all `.cargo/config.toml` files in the root of the repository (if present).
 
 An additional input `key` can be provided if the builtin keys are not sufficient.
 
-Before persisting, the cache is cleaned of intermediate artifacts and
-anything that is not a workspace dependency.
-In particular, no caching of workspace crates will be done. For
-this reason, this action will automatically set `CARGO_INCREMENTAL=0` to
-disable incremental compilation.
+Before being persisted, the cache is cleaned of:
+
+- Any files in `~/.cargo/bin` that were present before the action ran (for example `rustc`).
+- Dependencies that are no longer used.
+- Anything that is not a dependency.
+- Incremental build artifacts.
+- Any build artifacts with an `mtime` older than one week.
+
+In particular, the workspace crates themselves are not cached since doing so is
+[generally not effective](https://github.com/Swatinem/rust-cache/issues/37#issuecomment-944697938).
+For this reason, this action automatically sets `CARGO_INCREMENTAL=0` to disable
+incremental compilation, so that the Rust compiler doesn't waste time creating
+the additional artifacts required for incremental builds.
+
+The `~/.cargo/registry/src` directory is not cached since it is quicker for Cargo
+to recreate it from the compressed crate archives in `~/.cargo/registry/cache`.
 
 The action will try to restore from a previous `Cargo.lock` version as well, so
 lockfile updates should only re-build changed dependencies.
 
+The action invokes `cargo metadata` to determine the current set of dependencies.
+
 Additionally, the action automatically works around
 [cargo#8603](https://github.com/rust-lang/cargo/issues/8603) /
 [actions/cache#403](https://github.com/actions/cache/issues/403) which would
 otherwise corrupt the cache on macOS builds.
+
+## Cache Limits and Control
+
+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:
+[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.
+
+Caches from base branches are available to PRs, but not across unrelated
+branches.
+
+The caches can be controlled using the [Cache API](https://docs.github.com/en/rest/actions/cache)
+which allows listing existing caches and manually removing entries.
+
+## Debugging
+
+The action prints detailed information about which information it considers
+for its cache key, and it outputs more debug-only information about which
+cleanup steps it performs before persisting the cache.
+
+You can read up on how to [enable debug logging](https://docs.github.com/en/actions/monitoring-and-troubleshooting-workflows/enabling-debug-logging)
+to see those details as well as further details related to caching operations.
+
+## Known issues
+
+- The cache cleaning process currently removes all the files from `~/.cargo/bin`
+  that were present before the action ran (for example `rustc`), by default.
+  This can be an issue on long-running self-hosted runners, where such state
+  is expected to be preserved across runs. You can work around this by setting
+  `cache-bin: "false"`.

TODO.md

@@ -0,0 +1,3 @@
+- better .cargo/bin handling:
+  - get a list of all the files on "pre"/"restore"
+  - move the files out of the way on "post"/"save" and move them back afterwards

action.yml

@@ -1,24 +1,77 @@
 name: "Rust Cache"
 description: "A GitHub Action that implements smart caching for rust/cargo projects with sensible defaults."
-author: "Arpad Borsos <arpad.borsos@googlemail.com>"
+author: "Arpad Borsos <swatinem@swatinem.de>"
 inputs:
+  prefix-key:
+    description: "The prefix cache key, this can be changed to start a new cache manually."
+    required: false
+    default: "v0-rust"
+  shared-key:
+    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
-  sharedKey:
-    description: "An additional cache key that is stable over multiple jobs"
+  add-job-id-key:
+    description: "If the automatic `job`-based cache key should include the job id. Defaults to true."
     required: false
-  working-directory:
-    description: "The working directory this action should operate in"
+    default: "true"
+  add-rust-environment-hash-key:
+    description: "Weather the a hash of the rust environment should be included in the cache key. This includes a hash of all Cargo.toml/Cargo.lock files, rust-toolchain files, and .cargo/config.toml files (if present), as well as the specified 'env-vars'. Defaults to true."
     required: false
+    default: "true"
+  env-vars:
+    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."
+    required: false
+  cache-directories:
+    description: "Additional non workspace directories to be cached, separated by newlines."
+    required: false
+  cache-targets:
+    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."
+    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"
+  cache-workspace-crates:
+    description: "Similar to cache-all-crates. If `true` the workspace 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"
+  cache-provider:
+    description: "Determines which provider to use for caching. Options are github, or warpbuild. Defaults to github."
+    required: false
+    default: "github"
+  cache-bin:
+    description: "Determines whether to cache ${CARGO_HOME}/bin."
+    required: false
+    default: "true"
+  lookup-only:
+    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'
+    description: "A boolean value that indicates an exact match was found."
 runs:
-  using: "node12"
-  main: "dist/restore/index.js"
-  post: "dist/save/index.js"
-  post-if: "success()"
+  using: "node24"
+  main: "dist/restore.js"
+  post: "dist/save.js"
+  post-if: "success() || env.CACHE_ON_FAILURE == 'true'"
 branding:
   icon: "archive"
   color: "gray-dark"

dist/restore.js

@@ -0,0 +1,101 @@
+import { e as error, g as getCacheProvider, a as getInput, b as exportVariable, C as CacheConfig, i as info, c as cleanTargetDir, r as reportError, s as setOutput } from './cleanup-BPghO_DY.js';
+import 'os';
+import 'crypto';
+import 'fs';
+import 'path';
+import 'http';
+import 'https';
+import 'net';
+import 'tls';
+import 'events';
+import 'assert';
+import 'util';
+import 'node:assert';
+import 'node:net';
+import 'node:http';
+import 'node:stream';
+import 'node:buffer';
+import 'node:util';
+import 'node:querystring';
+import 'node:events';
+import 'node:diagnostics_channel';
+import 'node:tls';
+import 'node:zlib';
+import 'node:perf_hooks';
+import 'node:util/types';
+import 'node:worker_threads';
+import 'node:url';
+import 'node:async_hooks';
+import 'node:console';
+import 'node:dns';
+import 'string_decoder';
+import 'child_process';
+import 'timers';
+import 'stream';
+import 'fs/promises';
+
+process.on("uncaughtException", (e) => {
+    error(e.message);
+    if (e.stack) {
+        error(e.stack);
+    }
+});
+async function run() {
+    const cacheProvider = await getCacheProvider();
+    if (!cacheProvider.cache.isFeatureAvailable()) {
+        setCacheHitOutput(false);
+        return;
+    }
+    try {
+        var cacheOnFailure = getInput("cache-on-failure").toLowerCase();
+        if (cacheOnFailure !== "true") {
+            cacheOnFailure = "false";
+        }
+        var lookupOnly = getInput("lookup-only").toLowerCase() === "true";
+        exportVariable("CACHE_ON_FAILURE", cacheOnFailure);
+        exportVariable("CARGO_INCREMENTAL", 0);
+        const config = await CacheConfig.new();
+        config.printInfo(cacheProvider);
+        info("");
+        info(`... ${lookupOnly ? "Checking" : "Restoring"} cache ...`);
+        const key = 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.
+        const restoreKey = await cacheProvider.cache.restoreCache(config.cachePaths.slice(), key, [config.restoreKey], {
+            lookupOnly,
+        });
+        if (restoreKey) {
+            const match = restoreKey.localeCompare(key, undefined, {
+                sensitivity: "accent",
+            }) === 0;
+            info(`${lookupOnly ? "Found" : "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(match);
+        }
+        else {
+            info("No cache found.");
+            config.saveState();
+            setCacheHitOutput(false);
+        }
+    }
+    catch (e) {
+        setCacheHitOutput(false);
+        reportError(e);
+    }
+    process.exit();
+}
+function setCacheHitOutput(cacheHit) {
+    setOutput("cache-hit", cacheHit.toString());
+}
+run();

dist/save.js

@@ -0,0 +1,121 @@
+import { e as error, g as getCacheProvider, a as getInput, d as isCacheUpToDate, i as info, C as CacheConfig, c as cleanTargetDir, f as debug, h as cleanRegistry, j as cleanBin, k as cleanGit, r as reportError, l as exec } from './cleanup-BPghO_DY.js';
+import 'os';
+import 'crypto';
+import 'fs';
+import 'path';
+import 'http';
+import 'https';
+import 'net';
+import 'tls';
+import 'events';
+import 'assert';
+import 'util';
+import 'node:assert';
+import 'node:net';
+import 'node:http';
+import 'node:stream';
+import 'node:buffer';
+import 'node:util';
+import 'node:querystring';
+import 'node:events';
+import 'node:diagnostics_channel';
+import 'node:tls';
+import 'node:zlib';
+import 'node:perf_hooks';
+import 'node:util/types';
+import 'node:worker_threads';
+import 'node:url';
+import 'node:async_hooks';
+import 'node:console';
+import 'node:dns';
+import 'string_decoder';
+import 'child_process';
+import 'timers';
+import 'stream';
+import 'fs/promises';
+
+process.on("uncaughtException", (e) => {
+    error(e.message);
+    if (e.stack) {
+        error(e.stack);
+    }
+});
+async function run() {
+    const cacheProvider = await getCacheProvider();
+    const save = getInput("save-if").toLowerCase() || "true";
+    if (!(cacheProvider.cache.isFeatureAvailable() && save === "true")) {
+        return;
+    }
+    try {
+        if (isCacheUpToDate()) {
+            info(`Cache up-to-date.`);
+            return;
+        }
+        const config = CacheConfig.fromState();
+        config.printInfo(cacheProvider);
+        info("");
+        // TODO: remove this once https://github.com/actions/toolkit/pull/553 lands
+        if (process.env["RUNNER_OS"] == "macOS") {
+            await macOsWorkaround();
+        }
+        const workspaceCrates = getInput("cache-workspace-crates").toLowerCase() || "false";
+        const allPackages = [];
+        for (const workspace of config.workspaces) {
+            const packages = await workspace.getPackagesOutsideWorkspaceRoot(config.cmdFormat);
+            if (workspaceCrates === "true") {
+                const wsMembers = await workspace.getWorkspaceMembers(config.cmdFormat);
+                packages.push(...wsMembers);
+            }
+            allPackages.push(...packages);
+            try {
+                info(`... Cleaning ${workspace.target} ...`);
+                await cleanTargetDir(workspace.target, packages);
+            }
+            catch (e) {
+                debug(`${e.stack}`);
+            }
+        }
+        try {
+            const crates = getInput("cache-all-crates").toLowerCase() || "false";
+            info(`... Cleaning cargo registry (cache-all-crates: ${crates}) ...`);
+            await cleanRegistry(allPackages, crates !== "true");
+        }
+        catch (e) {
+            debug(`${e.stack}`);
+        }
+        if (config.cacheBin) {
+            try {
+                info(`... Cleaning cargo/bin ...`);
+                await cleanBin(config.cargoBins);
+            }
+            catch (e) {
+                debug(`${e.stack}`);
+            }
+        }
+        try {
+            info(`... Cleaning cargo git cache ...`);
+            await cleanGit(allPackages);
+        }
+        catch (e) {
+            debug(`${e.stack}`);
+        }
+        info(`... Saving cache ...`);
+        // 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 cacheProvider.cache.saveCache(config.cachePaths.slice(), config.cacheKey);
+    }
+    catch (e) {
+        reportError(e);
+    }
+    process.exit();
+}
+run();
+async function macOsWorkaround() {
+    try {
+        // Workaround for https://github.com/actions/cache/issues/403
+        // Also see https://github.com/rust-lang/cargo/issues/8603
+        await exec("sudo", ["/usr/sbin/purge"], { silent: true });
+    }
+    catch { }
+}

package.json

@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "rust-cache",
-  "version": "1.2.0",
+  "version": "2.9.2",
   "description": "A GitHub Action that implements smart caching for rust/cargo projects with sensible defaults.",
   "keywords": [
     "actions",
@@ -21,18 +21,35 @@
     "url": "https://github.com/sponsors/Swatinem"
   },
   "homepage": "https://github.com/Swatinem/rust-cache#readme",
+  "type": "module",
   "dependencies": {
-    "@actions/cache": "^1.0.6",
-    "@actions/core": "^1.2.6",
-    "@actions/exec": "^1.0.4",
-    "@actions/glob": "^0.1.1",
-    "@actions/io": "^1.0.2"
+    "@actions/cache": "^6.2.0",
+    "@actions/core": "^3.0.1",
+    "@actions/exec": "^3.0.0",
+    "@actions/glob": "^0.7.0",
+    "@actions/io": "^3.0.2",
+    "@actions/warpbuild-cache": "npm:github-actions.warp-cache@1.4.7",
+    "smol-toml": "^1.7.1"
+  },
+  "overrides": {
+    "@actions/cache": {
+      "@actions/glob": "$@actions/glob"
+    }
   },
   "devDependencies": {
-    "@vercel/ncc": "^0.27.0",
-    "typescript": "^4.1.5"
+    "@rollup/plugin-commonjs": "^29.0.3",
+    "@rollup/plugin-json": "^6.1.0",
+    "@rollup/plugin-node-resolve": "^16.0.3",
+    "@types/node": "^26.1.2",
+    "linefix": "^0.1.1",
+    "rollup": "^4.62.4",
+    "typescript": "7.0.2"
   },
   "scripts": {
-    "prepare": "ncc build --target es2020 -o dist/restore src/restore.ts && ncc build --target es2020 -o dist/save src/save.ts"
+    "clean": "node -e \"(async () => { try { await require('fs/promises').rm('dist', { recursive: true }); } catch {} })()\"",
+    "prebuild": "npm run clean",
+    "build": "tsc && rollup --config .build/rollup.config.js",
+    "prepublishOnly": "npm run test",
+    "prepare": "npm run build && linefix dist"
   }
 }

rollup.config.ts

@@ -0,0 +1,11 @@
+import commonjs from "@rollup/plugin-commonjs";
+import json from "@rollup/plugin-json";
+import nodeResolve from "@rollup/plugin-node-resolve";
+import type { RollupWatchOptions } from "rollup";
+
+const config: RollupWatchOptions = {
+  input: ["./.build/src/restore.js", "./.build/src/save.js"],
+  output: { dir: "./dist", format: "es" },
+  plugins: [nodeResolve({ preferBuiltins: true }), commonjs(), json()],
+};
+export default config;

src/cleanup.ts

@@ -0,0 +1,310 @@
+import * as core from "@actions/core";
+import * as io from "@actions/io";
+import fs from "fs";
+import path from "path";
+
+import { CARGO_HOME } from "./config.js";
+import { exists } from "./utils.js";
+import { Packages } from "./workspace.js";
+
+export async function cleanTargetDir(targetDir: string, packages: Packages, checkTimestamp = false) {
+  core.debug(`cleaning target directory "${targetDir}"`);
+
+  // remove all *files* from the profile directory
+  let dir = await fs.promises.opendir(targetDir);
+  for await (const dirent of dir) {
+    if (dirent.isDirectory()) {
+      let dirName = path.join(dir.path, dirent.name);
+      // Target-triple directories do not contain Cargo's target directory
+      // markers, so identify profiles by their artifact directories as well.
+      const isProfile =
+        dirent.name === "tests" ||
+        (await exists(path.join(dirName, "build"))) ||
+        (await exists(path.join(dirName, ".fingerprint"))) ||
+        (await exists(path.join(dirName, "deps")));
+
+      try {
+        if (isProfile) {
+          await cleanProfileTarget(dirName, packages, checkTimestamp);
+        } else {
+          await cleanTargetDir(dirName, packages, checkTimestamp);
+        }
+      } catch {}
+    } else if (dirent.name !== "CACHEDIR.TAG") {
+      await rm(dir.path, dirent);
+    }
+  }
+}
+
+async function cleanProfileTarget(profileDir: string, packages: Packages, checkTimestamp = false) {
+  core.debug(`cleaning profile directory "${profileDir}"`);
+
+  // Quite a few testing utility crates store compilation artifacts as nested
+  // workspaces under `target/tests`. Notably, `target/tests/target` and
+  // `target/tests/trybuild`.
+  if (path.basename(profileDir) === "tests") {
+    try {
+      // https://github.com/vertexclique/kaos/blob/9876f6c890339741cc5be4b7cb9df72baa5a6d79/src/cargo.rs#L25
+      // https://github.com/eupn/macrotest/blob/c4151a5f9f545942f4971980b5d264ebcd0b1d11/src/cargo.rs#L27
+      cleanTargetDir(path.join(profileDir, "target"), packages, checkTimestamp);
+    } catch {}
+    try {
+      // https://github.com/dtolnay/trybuild/blob/eec8ca6cb9b8f53d0caf1aa499d99df52cae8b40/src/cargo.rs#L50
+      cleanTargetDir(path.join(profileDir, "trybuild"), packages, checkTimestamp);
+    } catch {}
+
+    // Delete everything else.
+    await rmExcept(profileDir, new Set(["target", "trybuild"]), checkTimestamp);
+
+    return;
+  }
+
+  let keepProfile = new Set(["build", ".fingerprint", "deps"]);
+  await rmExcept(profileDir, keepProfile);
+
+  const keepPkg = new Set(packages.flatMap((p) => [p.name, ...p.targets.map((t) => t.replace(/-/g, "_"))]));
+  await rmExcept(path.join(profileDir, "build"), keepPkg, checkTimestamp);
+  await rmExcept(path.join(profileDir, ".fingerprint"), keepPkg, checkTimestamp);
+
+  const keepDeps = new Set(
+    packages.flatMap((p) => {
+      const names = [];
+      for (const n of [p.name, ...p.targets]) {
+        const name = n.replace(/-/g, "_");
+        names.push(name, `lib${name}`);
+      }
+      return names;
+    }),
+  );
+  await rmExcept(path.join(profileDir, "deps"), keepDeps, checkTimestamp);
+}
+
+/**
+ * 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 binsToRemove = new Set<string>(oldBins);
+
+  const dir = await fs.promises.opendir(path.join(CARGO_HOME, "bin"));
+  for await (const dirent of dir) {
+    if (dirent.isFile() && binsToRemove.has(dirent.name)) {
+      await rm(dir.path, dirent);
+    }
+  }
+}
+
+export async function cleanRegistry(packages: Packages, crates = true) {
+  // remove `.cargo/credentials.toml`
+  try {
+    const credentials = path.join(CARGO_HOME, "credentials.toml");
+    core.debug(`deleting "${credentials}"`);
+    await fs.promises.unlink(credentials);
+  } catch {}
+
+  // `.cargo/registry/index`
+  let pkgSet = new Set(packages.map((p) => p.name));
+  const indexDir = await fs.promises.opendir(path.join(CARGO_HOME, "registry", "index"));
+  for await (const dirent of indexDir) {
+    if (dirent.isDirectory()) {
+      // eg `.cargo/registry/index/github.com-1ecc6299db9ec823`
+      // or `.cargo/registry/index/index.crates.io-e139d0d48fed7772`
+      const dirPath = path.join(indexDir.path, dirent.name);
+
+      // for a git registry, we can remove `.cache`, as cargo will recreate it from git
+      if (await exists(path.join(dirPath, ".git"))) {
+        await rmRF(path.join(dirPath, ".cache"));
+      } else {
+        await cleanRegistryIndexCache(dirPath, pkgSet);
+      }
+    }
+  }
+
+  if (!crates) {
+    core.debug("skipping registry cache and src cleanup");
+    return;
+  }
+
+  // `.cargo/registry/src`
+  // Cargo usually re-creates these from the `.crate` cache below,
+  // but for some reason that does not work for `-sys` crates that check timestamps
+  // to decide if rebuilds are necessary.
+  pkgSet = new Set(packages.filter((p) => p.name.endsWith("-sys")).map((p) => `${p.name}-${p.version}`));
+  const srcDir = await fs.promises.opendir(path.join(CARGO_HOME, "registry", "src"));
+  for await (const dirent of srcDir) {
+    if (dirent.isDirectory()) {
+      // eg `.cargo/registry/src/github.com-1ecc6299db9ec823`
+      // or `.cargo/registry/src/index.crates.io-e139d0d48fed7772`
+      const dir = await fs.promises.opendir(path.join(srcDir.path, dirent.name));
+      for await (const dirent of dir) {
+        if (dirent.isDirectory() && !pkgSet.has(dirent.name)) {
+          await rmRF(path.join(dir.path, dirent.name));
+        }
+      }
+    }
+  }
+
+  // `.cargo/registry/cache`
+  pkgSet = new Set(packages.map((p) => `${p.name}-${p.version}.crate`));
+  const cacheDir = await fs.promises.opendir(path.join(CARGO_HOME, "registry", "cache"));
+  for await (const dirent of cacheDir) {
+    if (dirent.isDirectory()) {
+      // eg `.cargo/registry/cache/github.com-1ecc6299db9ec823`
+      // or `.cargo/registry/cache/index.crates.io-e139d0d48fed7772`
+      const dir = await fs.promises.opendir(path.join(cacheDir.path, dirent.name));
+      for await (const dirent of dir) {
+        // here we check that the downloaded `.crate` matches one from our dependencies
+        if (dirent.isFile() && !pkgSet.has(dirent.name)) {
+          await rm(dir.path, dirent);
+        }
+      }
+    }
+  }
+}
+
+/// Recursively walks and cleans the index `.cache`
+async function cleanRegistryIndexCache(dirName: string, keepPkg: Set<string>) {
+  let dirIsEmpty = true;
+  const cacheDir = await fs.promises.opendir(dirName);
+  for await (const dirent of cacheDir) {
+    if (dirent.isDirectory()) {
+      if (await cleanRegistryIndexCache(path.join(dirName, dirent.name), keepPkg)) {
+        await rm(dirName, dirent);
+      } else {
+        dirIsEmpty &&= false;
+      }
+    } else {
+      if (keepPkg.has(dirent.name)) {
+        dirIsEmpty &&= false;
+      } else {
+        await rm(dirName, dirent);
+      }
+    }
+  }
+  return dirIsEmpty;
+}
+
+export async function cleanGit(packages: Packages) {
+  const coPath = path.join(CARGO_HOME, "git", "checkouts");
+  const dbPath = path.join(CARGO_HOME, "git", "db");
+  const repos = new Map<string, Set<string>>();
+  for (const p of packages) {
+    if (!p.path.startsWith(coPath)) {
+      continue;
+    }
+    const [repo, ref] = p.path.slice(coPath.length + 1).split(path.sep);
+    const refs = repos.get(repo);
+    if (refs) {
+      refs.add(ref);
+    } else {
+      repos.set(repo, new Set([ref]));
+    }
+  }
+
+  // we have to keep both the clone, and the checkout, removing either will
+  // trigger a rebuild
+
+  // clean the db
+  try {
+    let dir = await fs.promises.opendir(dbPath);
+    for await (const dirent of dir) {
+      if (!repos.has(dirent.name)) {
+        await rm(dir.path, dirent);
+      }
+    }
+  } catch {}
+
+  // clean the checkouts
+  try {
+    let dir = await fs.promises.opendir(coPath);
+    for await (const dirent of dir) {
+      const refs = repos.get(dirent.name);
+      if (!refs) {
+        await rm(dir.path, dirent);
+        continue;
+      }
+      if (!dirent.isDirectory()) {
+        continue;
+      }
+      const refsDir = await fs.promises.opendir(path.join(dir.path, dirent.name));
+      for await (const dirent of refsDir) {
+        if (!refs.has(dirent.name)) {
+          await rm(refsDir.path, dirent);
+        }
+      }
+    }
+  } catch {}
+}
+
+const ONE_WEEK = 7 * 24 * 3600 * 1000;
+
+/**
+ * Removes all files or directories in `dirName` matching some criteria.
+ *
+ * These two modes are mutually exclusive. When the `checkTimestamp` flag is
+ * set, this will remove anything older than one week and `keepPrefix` is
+ * ignored.
+ *
+ * Otherwise, it will remove everything that does not match any string in the
+ * `keepPrefix` set.
+ * The matching strips and trailing `-$hash` suffix.
+ *
+ * Cargo's newer `build-dir` layout (rust-lang/cargo#17258) nests the hash as
+ * a subdirectory instead of appending it, so entries there are bare package
+ * names with no suffix to strip. Check for an exact match first so those
+ * names (which may themselves contain hyphens) aren't mistaken for a
+ * `<name>-<hash>` entry from the old layout and truncated incorrectly.
+ */
+async function rmExcept(dirName: string, keepPrefix: Set<string>, checkTimestamp = false) {
+  const dir = await fs.promises.opendir(dirName);
+  for await (const dirent of dir) {
+    if (checkTimestamp) {
+      const fileName = path.join(dir.path, dirent.name);
+      const { mtime } = await fs.promises.stat(fileName);
+      const isOutdated = Date.now() - mtime.getTime() > ONE_WEEK;
+
+      if (isOutdated) {
+        await rm(dir.path, dirent);
+      }
+      continue;
+    }
+
+    let name = dirent.name;
+
+    // in Cargo's V1 layout, all packages are suffixed by their hash.
+    // in V2, all package hashes are subdirectories instead.
+    // Check both possible naming standards for packages and accept either.
+
+    // v2 package format
+    if (!keepPrefix.has(name)) {
+      // now check for v1 package format
+      // strip the trailing hash
+      const idx = name.lastIndexOf("-");
+      if (idx !== -1) {
+        name = name.slice(0, idx);
+      }
+      if (!keepPrefix.has(name)) {
+        await rm(dir.path, dirent);
+      }
+    }
+  }
+}
+
+async function rm(parent: string, dirent: fs.Dirent) {
+  try {
+    const fileName = path.join(parent, dirent.name);
+    core.debug(`deleting "${fileName}"`);
+    if (dirent.isFile()) {
+      await fs.promises.unlink(fileName);
+    } else if (dirent.isDirectory()) {
+      await io.rmRF(fileName);
+    }
+  } catch {}
+}
+
+async function rmRF(dirName: string) {
+  core.debug(`deleting "${dirName}"`);
+  await io.rmRF(dirName);
+}

src/common.ts

@@ -1,242 +0,0 @@
-import * as core from "@actions/core";
-import * as exec from "@actions/exec";
-import * as glob from "@actions/glob";
-import * as io from "@actions/io";
-import crypto from "crypto";
-import fs from "fs";
-import os from "os";
-import path from "path";
-
-process.on("uncaughtException", (e) => {
-  core.info(`[warning] ${e.message}`);
-});
-
-const cwd = core.getInput("working-directory");
-if (cwd) {
-  process.chdir(cwd);
-}
-
-export const stateBins = "RUST_CACHE_BINS";
-export const stateKey = "RUST_CACHE_KEY";
-const stateHash = "RUST_CACHE_HASH";
-
-const home = os.homedir();
-const cargoHome = process.env.CARGO_HOME || path.join(home, ".cargo");
-export const paths = {
-  cargoHome,
-  index: path.join(cargoHome, "registry/index"),
-  cache: path.join(cargoHome, "registry/cache"),
-  git: path.join(cargoHome, "git"),
-  target: "target",
-};
-
-interface CacheConfig {
-  paths: Array<string>;
-  key: string;
-  restoreKeys: Array<string>;
-}
-
-const RefKey = "GITHUB_REF";
-
-export function isValidEvent(): boolean {
-  return RefKey in process.env && Boolean(process.env[RefKey]);
-}
-
-export async function getCacheConfig(): Promise<CacheConfig> {
-  let lockHash = core.getState(stateHash);
-  if (!lockHash) {
-    lockHash = await getLockfileHash();
-    core.saveState(stateHash, lockHash);
-  }
-
-  let key = `v0-rust-`;
-
-  const sharedKey = core.getInput("sharedKey");
-  if (sharedKey) {
-    key += `${sharedKey}-`;
-  } else {
-    const inputKey = core.getInput("key");
-    if (inputKey) {
-      key += `${inputKey}-`;
-    }
-
-    const job = process.env.GITHUB_JOB;
-    if (job) {
-      key += `${job}-`;
-    }
-  }
-
-  key += await getRustKey();
-
-  return {
-    paths: [
-      path.join(cargoHome, "bin"),
-      path.join(cargoHome, ".crates2.json"),
-      path.join(cargoHome, ".crates.toml"),
-      paths.git,
-      paths.cache,
-      paths.index,
-      paths.target,
-    ],
-    key: `${key}-${lockHash}`,
-    restoreKeys: [key],
-  };
-}
-
-export async function getCargoBins(): Promise<Set<string>> {
-  const { installs }: { installs: { [key: string]: { bins: Array<string> } } } = JSON.parse(
-    await fs.promises.readFile(path.join(paths.cargoHome, ".crates2.json"), "utf8"),
-  );
-  const bins = new Set<string>();
-  for (const pkg of Object.values(installs)) {
-    for (const bin of pkg.bins) {
-      bins.add(bin);
-    }
-  }
-  return bins;
-}
-
-async function getRustKey(): Promise<string> {
-  const rustc = await getRustVersion();
-  return `${rustc.release}-${rustc.host}-${rustc["commit-hash"].slice(0, 12)}`;
-}
-
-interface RustVersion {
-  host: string;
-  release: string;
-  "commit-hash": string;
-}
-
-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()))
-    .filter((s) => s.length === 2);
-  return Object.fromEntries(splits);
-}
-
-export async function getCmdOutput(
-  cmd: string,
-  args: Array<string> = [],
-  options: exec.ExecOptions = {},
-): Promise<string> {
-  let stdout = "";
-  await exec.exec(cmd, args, {
-    silent: true,
-    listeners: {
-      stdout(data) {
-        stdout += data.toString();
-      },
-    },
-    ...options,
-  });
-  return stdout;
-}
-
-async function getLockfileHash(): Promise<string> {
-  const globber = await glob.create("**/Cargo.toml\n**/Cargo.lock", { followSymbolicLinks: false });
-  const files = await globber.glob();
-  files.sort((a, b) => a.localeCompare(b));
-
-  const hasher = crypto.createHash("sha1");
-  for (const file of files) {
-    for await (const chunk of fs.createReadStream(file)) {
-      hasher.update(chunk);
-    }
-  }
-  return hasher.digest("hex").slice(0, 20);
-}
-
-export interface PackageDefinition {
-  name: string;
-  version: string;
-  path: string;
-  targets: Array<string>;
-}
-
-export type Packages = Array<PackageDefinition>;
-
-interface Meta {
-  packages: Array<{
-    name: string;
-    version: string;
-    manifest_path: string;
-    targets: Array<{ kind: Array<string>; name: string }>;
-  }>;
-}
-
-export async function getPackages(): Promise<Packages> {
-  const cwd = process.cwd();
-  const meta: Meta = JSON.parse(await getCmdOutput("cargo", ["metadata", "--all-features", "--format-version", "1"]));
-
-  return meta.packages
-    .filter((p) => !p.manifest_path.startsWith(cwd))
-    .map((p) => {
-      const targets = p.targets.filter((t) => t.kind[0] === "lib").map((t) => t.name);
-      return { name: p.name, version: p.version, targets, path: path.dirname(p.manifest_path) };
-    });
-}
-
-export async function cleanTarget(packages: Packages) {
-  await fs.promises.unlink("./target/.rustc_info.json");
-  await io.rmRF("./target/debug/examples");
-  await io.rmRF("./target/debug/incremental");
-
-  let dir: fs.Dir;
-  // remove all *files* from debug
-  dir = await fs.promises.opendir("./target/debug");
-  for await (const dirent of dir) {
-    if (dirent.isFile()) {
-      await rm(dir.path, dirent);
-    }
-  }
-
-  const keepPkg = new Set(packages.map((p) => p.name));
-  await rmExcept("./target/debug/build", keepPkg);
-  await rmExcept("./target/debug/.fingerprint", keepPkg);
-
-  const keepDeps = new Set(
-    packages.flatMap((p) => {
-      const names = [];
-      for (const n of [p.name, ...p.targets]) {
-        const name = n.replace(/-/g, "_");
-        names.push(name, `lib${name}`);
-      }
-      return names;
-    }),
-  );
-  await rmExcept("./target/debug/deps", keepDeps);
-}
-
-const oneWeek = 7 * 24 * 3600 * 1000;
-
-export async function rmExcept(dirName: string, keepPrefix: Set<string>) {
-  const dir = await fs.promises.opendir(dirName);
-  for await (const dirent of dir) {
-    let name = dirent.name;
-    const idx = name.lastIndexOf("-");
-    if (idx !== -1) {
-      name = name.slice(0, idx);
-    }
-    const fileName = path.join(dir.path, dirent.name);
-    const { mtime } = await fs.promises.stat(fileName);
-    // we don’t really know
-    if (!keepPrefix.has(name) || Date.now() - mtime.getTime() > oneWeek) {
-      await rm(dir.path, dirent);
-    }
-  }
-}
-
-export async function rm(parent: string, dirent: fs.Dirent) {
-  try {
-    const fileName = path.join(parent, dirent.name);
-    core.debug(`deleting "${fileName}"`);
-    if (dirent.isFile()) {
-      await fs.promises.unlink(fileName);
-    } else if (dirent.isDirectory()) {
-      await io.rmRF(fileName);
-    }
-  } catch {}
-}

src/config.ts

@@ -0,0 +1,465 @@
+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 os from "os";
+import path from "path";
+import * as toml from "smol-toml";
+
+import { CacheProvider, exists, getCmdOutput } from "./utils.js";
+import { Workspace } from "./workspace.js";
+
+const HOME = os.homedir();
+export const CARGO_HOME = process.env.CARGO_HOME || path.join(HOME, ".cargo");
+
+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 */
+  public cacheKey = "";
+  /** The secondary (restore) key that only contains the prefix and environment */
+  public restoreKey = "";
+
+  /** Whether to cache CARGO_HOME/.bin */
+  public cacheBin: boolean = true;
+
+  /** 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 */
+  private keyRust: Array<string> = [];
+  /** The environment variables considered for the cache key */
+  private keyEnvs: Array<string> = [];
+  /** The files considered for the cache key */
+  private keyFiles: Array<string> = [];
+
+  private constructor() {}
+
+  /**
+   * Constructs a [`CacheConfig`] with all the paths and keys.
+   *
+   * This will read the action `input`s, and read and persist `state` as necessary.
+   */
+  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.
+
+    let key = core.getInput("prefix-key") || "v0-rust";
+
+    const sharedKey = core.getInput("shared-key");
+    if (sharedKey) {
+      key += `-${sharedKey}`;
+    } else {
+      const inputKey = core.getInput("key");
+      if (inputKey) {
+        key += `-${inputKey}`;
+      }
+
+      const job = process.env.GITHUB_JOB;
+      if (job && core.getInput("add-job-id-key").toLowerCase() == "true") {
+        key += `-${job}`;
+      }
+    }
+
+    // Add runner OS and CPU architecture to the key to avoid cross-contamination of cache
+    const runnerOS = os.type();
+    const runnerArch = os.arch();
+    key += `-${runnerOS}-${runnerArch}`;
+
+    self.keyPrefix = key;
+
+    // Construct environment portion of the key:
+    // This consists of a hash that considers the rust version
+    // as well as all the environment variables as given by a default list
+    // and the `env-vars` input.
+    // The env vars are sorted, matched by prefix and hashed into the
+    // resulting environment hash.
+
+    let hasher = crypto.createHash("sha1");
+    const rustVersions = (self.keyRust = await getRustVersions(cmdFormat));
+    for (const rustVersion of rustVersions) {
+      hasher.update(rustVersion);
+    }
+
+    // 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));
+
+    // sort the available env vars so we have a more stable hash
+    const keyEnvs = [];
+    const envKeys = Object.keys(process.env);
+    envKeys.sort((a, b) => a.localeCompare(b));
+    for (const key of envKeys) {
+      const value = process.env[key];
+      if (envPrefixes.some((prefix) => key.startsWith(prefix)) && value) {
+        hasher.update(`${key}=${value}`);
+        keyEnvs.push(key);
+      }
+    }
+
+    self.keyEnvs = keyEnvs;
+
+    // Add job hash suffix if 'add-rust-environment-hash-key' is true
+    if (core.getInput("add-rust-environment-hash-key").toLowerCase() == "true") {
+      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.
+
+    self.cacheBin = core.getInput("cache-bin").toLowerCase() == "true";
+
+    // Constructs the workspace config and paths to restore:
+    // The workspaces are given using a `$workspace -> $target` syntax.
+
+    const workspaces: Array<Workspace> = [];
+    const workspacesInput = core.getInput("workspaces") || ".";
+    for (const workspace of workspacesInput.trim().split("\n")) {
+      let [root, target = "target"] = workspace.split("->").map((s) => s.trim());
+      root = path.resolve(root);
+      target = path.join(root, target);
+      workspaces.push(new Workspace(root, target));
+    }
+    self.workspaces = workspaces;
+
+    // Add hash suffix of all rust environment lockfiles + manifests if
+    // 'add-rust-environment-hash-key' is true
+    if (core.getInput("add-rust-environment-hash-key").toLowerCase() == "true") {
+      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 workspaceMembers = await workspace.getWorkspaceMembers(cmdFormat);
+
+        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" });
+            // Use any since TomlPrimitive is not exposed
+            const parsed = toml.parse(content) as { [key: string]: any };
+
+            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];
+
+                try {
+                  if ("path" in dep) {
+                    dep.version = "0.0.0";
+                    dep.path = "";
+                  }
+                } catch (_e) {
+                  // Not an object, probably a string (version),
+                  // continue.
+                  continue;
+                }
+              }
+            }
+
+            hasher.update(JSON.stringify(parsed));
+
+            parsedKeyFiles.push(cargo_manifest);
+          } catch (e) {
+            // Fallback to caching them as regular file
+            core.warning(`Error parsing Cargo.toml manifest, fallback to caching entire file: ${e}`);
+            keyFiles.push(cargo_manifest);
+          }
+        }
+
+        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 parsed = toml.parse(content);
+
+            if ((parsed.version !== 3 && parsed.version !== 4) || !("package" in parsed)) {
+              // Fallback to caching them as regular file since this action
+              // can only handle Cargo.lock format version 3
+              core.warning("Unsupported Cargo.lock format, fallback to caching entire file");
+              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 as any[]).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
+            core.warning(`Error parsing Cargo.lock manifest, fallback to caching entire file: ${e}`);
+            keyFiles.push(cargo_lock);
+          }
+        }
+      }
+      keyFiles = sort_and_uniq(keyFiles);
+
+      for (const file of keyFiles) {
+        for await (const chunk of createReadStream(file)) {
+          hasher.update(chunk);
+        }
+      }
+
+      keyFiles.push(...parsedKeyFiles);
+      self.keyFiles = sort_and_uniq(keyFiles);
+
+      let lockHash = digest(hasher);
+      key += `-${lockHash}`;
+    }
+
+    self.cacheKey = key;
+
+    self.cachePaths = [path.join(CARGO_HOME, "registry"), path.join(CARGO_HOME, "git")];
+    if (self.cacheBin) {
+      self.cachePaths = [
+        path.join(CARGO_HOME, "bin"),
+        path.join(CARGO_HOME, ".crates.toml"),
+        path.join(CARGO_HOME, ".crates2.json"),
+        ...self.cachePaths,
+      ];
+    }
+    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(/\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(cacheProvider: CacheProvider) {
+    core.startGroup("Cache Configuration");
+    core.info(`Cache Provider:`);
+    core.info(`    ${cacheProvider.name}`);
+    core.info(`Workspaces:`);
+    for (const workspace of this.workspaces) {
+      core.info(`    ${workspace.root}`);
+    }
+    core.info(`Cache Paths:`);
+    for (const path of this.cachePaths) {
+      core.info(`    ${path}`);
+    }
+    core.info(`Restore Key:`);
+    core.info(`    ${this.restoreKey}`);
+    core.info(`Cache Key:`);
+    core.info(`    ${this.cacheKey}`);
+    core.info(`.. Prefix:`);
+    core.info(`  - ${this.keyPrefix}`);
+    core.info(`.. Environment considered:`);
+    core.info(`  - Rust Versions:`);
+    for (const rust of this.keyRust) {
+      core.info(`    - ${rust}`);
+    }
+    for (const env of this.keyEnvs) {
+      core.info(`  - ${env}`);
+    }
+    core.info(`.. Lockfiles considered:`);
+    for (const file of this.keyFiles) {
+      core.info(`  - ${file}`);
+    }
+    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);
+}
+
+export async function getCargoBins(): Promise<Set<string>> {
+  const bins = new Set<string>();
+
+  try {
+    const dir = await fs.opendir(path.join(CARGO_HOME, "bin"));
+    for await (const dirent of dir) {
+      if (dirent.isFile()) {
+        bins.add(dirent.name);
+      }
+    }
+  } catch {}
+
+  return bins;
+}
+
+async function getRustVersions(cmdFormat: string): Promise<Array<string>> {
+  const versions = new Set<string>();
+
+  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`)));
+    }
+  }
+  const rustVersions = Array.from(versions);
+  // Doesn't matter how they're sorted, just as long as it's deterministic.
+  rustVersions.sort();
+  return rustVersions;
+}
+
+interface RustVersion {
+  host: string;
+  release: string;
+  "commit-hash": string;
+}
+function parseRustVersion(stdout: string): string {
+  const splits = stdout
+    .split(/[\n\r]+/)
+    .filter(Boolean)
+    .map((s) => s.split(":").map((s) => s.trim()))
+    .filter((s) => s.length === 2);
+  const { release, host, "commit-hash": commitHash } = Object.fromEntries(splits) as RustVersion;
+  return `${release} ${host} ${commitHash}`;
+}
+
+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
+  // 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;
+}
+
+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;
+    }, []);
+}

src/restore.ts

@@ -1,42 +1,77 @@
-import * as cache from "@actions/cache";
 import * as core from "@actions/core";
-import { cleanTarget, getCacheConfig, getCargoBins, getPackages, stateBins, stateKey } from "./common";
+
+import { cleanTargetDir } from "./cleanup.js";
+import { CacheConfig } from "./config.js";
+import { getCacheProvider, reportError } from "./utils.js";
+
+process.on("uncaughtException", (e) => {
+  core.error(e.message);
+  if (e.stack) {
+    core.error(e.stack);
+  }
+});
 
 async function run() {
+  const cacheProvider = await getCacheProvider();
+
+  if (!cacheProvider.cache.isFeatureAvailable()) {
+    setCacheHitOutput(false);
+    return;
+  }
+
   try {
+    var cacheOnFailure = core.getInput("cache-on-failure").toLowerCase();
+    if (cacheOnFailure !== "true") {
+      cacheOnFailure = "false";
+    }
+    var lookupOnly = core.getInput("lookup-only").toLowerCase() === "true";
+
+    core.exportVariable("CACHE_ON_FAILURE", cacheOnFailure);
     core.exportVariable("CARGO_INCREMENTAL", 0);
 
-    const { paths, key, restoreKeys } = await getCacheConfig();
+    const config = await CacheConfig.new();
+    config.printInfo(cacheProvider);
+    core.info("");
 
-    const bins = await getCargoBins();
-    core.saveState(stateBins, JSON.stringify([...bins]));
-
-    core.info(`Restoring paths:\n    ${paths.join("\n    ")}`);
-    core.info(`In directory:\n    ${process.cwd()}`);
-    core.info(`Using keys:\n    ${[key, ...restoreKeys].join("\n    ")}`);
-    const restoreKey = await cache.restoreCache(paths, key, restoreKeys);
+    core.info(`... ${lookupOnly ? "Checking" : "Restoring"} cache ...`);
+    const key = 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.
+    const restoreKey = await cacheProvider.cache.restoreCache(config.cachePaths.slice(), key, [config.restoreKey], {
+      lookupOnly,
+    });
     if (restoreKey) {
-      core.info(`Restored from cache key "${restoreKey}".`);
-      core.saveState(stateKey, restoreKey);
-
-      if (restoreKey !== key) {
+      const match =
+        restoreKey.localeCompare(key, undefined, {
+          sensitivity: "accent",
+        }) === 0;
+      core.info(`${lookupOnly ? "Found" : "Restored from"} cache key "${restoreKey}" full match: ${match}.`);
+      if (!match) {
         // pre-clean the target directory on cache mismatch
-        const packages = await getPackages();
+        for (const workspace of config.workspaces) {
+          try {
+            await cleanTargetDir(workspace.target, [], true);
+          } catch {}
+        }
 
-        await cleanTarget(packages);
+        // 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.message}`);
+    reportError(e);
   }
+  process.exit();
 }
 
 function setCacheHitOutput(cacheHit: boolean): void {

src/save.ts

@@ -1,153 +1,95 @@
-import * as cache from "@actions/cache";
 import * as core from "@actions/core";
 import * as exec from "@actions/exec";
-import * as glob from "@actions/glob";
-import * as io from "@actions/io";
-import fs from "fs";
-import path from "path";
-import {
-  cleanTarget,
-  getCacheConfig,
-  getCargoBins,
-  getPackages,
-  Packages,
-  paths,
-  rm,
-  stateBins,
-  stateKey,
-} from "./common";
+
+import { cleanBin, cleanGit, cleanRegistry, cleanTargetDir } from "./cleanup.js";
+import { CacheConfig, isCacheUpToDate } from "./config.js";
+import { getCacheProvider, reportError } from "./utils.js";
+
+process.on("uncaughtException", (e) => {
+  core.error(e.message);
+  if (e.stack) {
+    core.error(e.stack);
+  }
+});
 
 async function run() {
-  try {
-    const { paths: savePaths, key } = await getCacheConfig();
+  const cacheProvider = await getCacheProvider();
 
-    if (core.getState(stateKey) === key) {
+  const save = core.getInput("save-if").toLowerCase() || "true";
+
+  if (!(cacheProvider.cache.isFeatureAvailable() && save === "true")) {
+    return;
+  }
+
+  try {
+    if (isCacheUpToDate()) {
       core.info(`Cache up-to-date.`);
       return;
     }
 
+    const config = CacheConfig.fromState();
+    config.printInfo(cacheProvider);
+    core.info("");
+
     // TODO: remove this once https://github.com/actions/toolkit/pull/553 lands
-    await macOsWorkaround();
+    if (process.env["RUNNER_OS"] == "macOS") {
+      await macOsWorkaround();
+    }
 
-    const registryName = await getRegistryName();
-    const packages = await getPackages();
+    const workspaceCrates = core.getInput("cache-workspace-crates").toLowerCase() || "false";
+    const allPackages = [];
+    for (const workspace of config.workspaces) {
+      const packages = await workspace.getPackagesOutsideWorkspaceRoot(config.cmdFormat);
+      if (workspaceCrates === "true") {
+        const wsMembers = await workspace.getWorkspaceMembers(config.cmdFormat);
+        packages.push(...wsMembers);
+      }
+      allPackages.push(...packages);
+      try {
+        core.info(`... Cleaning ${workspace.target} ...`);
+        await cleanTargetDir(workspace.target, packages);
+      } catch (e) {
+        core.debug(`${(e as any).stack}`);
+      }
+    }
 
     try {
-      await cleanRegistry(registryName, packages);
-    } catch {}
+      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.debug(`${(e as any).stack}`);
+    }
+
+    if (config.cacheBin) {
+      try {
+        core.info(`... Cleaning cargo/bin ...`);
+        await cleanBin(config.cargoBins);
+      } catch (e) {
+        core.debug(`${(e as any).stack}`);
+      }
+    }
 
     try {
-      await cleanBin();
-    } catch {}
+      core.info(`... Cleaning cargo git cache ...`);
+      await cleanGit(allPackages);
+    } catch (e) {
+      core.debug(`${(e as any).stack}`);
+    }
 
-    try {
-      await cleanGit(packages);
-    } catch {}
-
-    try {
-      await cleanTarget(packages);
-    } catch {}
-
-    core.info(`Saving paths:\n    ${savePaths.join("\n    ")}`);
-    core.info(`In directory:\n    ${process.cwd()}`);
-    core.info(`Using key:\n    ${key}`);
-    await cache.saveCache(savePaths, key);
+    core.info(`... Saving cache ...`);
+    // 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 cacheProvider.cache.saveCache(config.cachePaths.slice(), config.cacheKey);
   } catch (e) {
-    core.info(`[warning] ${e.message}`);
+    reportError(e);
   }
+  process.exit();
 }
 
 run();
 
-async function getRegistryName(): Promise<string> {
-  const globber = await glob.create(`${paths.index}/**/.last-updated`, { followSymbolicLinks: false });
-  const files = await globber.glob();
-  if (files.length > 1) {
-    core.warning(`got multiple registries: "${files.join('", "')}"`);
-  }
-
-  const first = files.shift()!;
-  return path.basename(path.dirname(first));
-}
-
-async function cleanBin() {
-  const bins = await getCargoBins();
-  const oldBins = JSON.parse(core.getState(stateBins));
-
-  for (const bin of oldBins) {
-    bins.delete(bin);
-  }
-
-  const dir = await fs.promises.opendir(path.join(paths.cargoHome, "bin"));
-  for await (const dirent of dir) {
-    if (dirent.isFile() && !bins.has(dirent.name)) {
-      await rm(dir.path, dirent);
-    }
-  }
-}
-
-async function cleanRegistry(registryName: string, packages: Packages) {
-  await io.rmRF(path.join(paths.index, registryName, ".cache"));
-
-  const pkgSet = new Set(packages.map((p) => `${p.name}-${p.version}.crate`));
-
-  const dir = await fs.promises.opendir(path.join(paths.cache, registryName));
-  for await (const dirent of dir) {
-    if (dirent.isFile() && !pkgSet.has(dirent.name)) {
-      await rm(dir.path, dirent);
-    }
-  }
-}
-
-async function cleanGit(packages: Packages) {
-  const coPath = path.join(paths.git, "checkouts");
-  const dbPath = path.join(paths.git, "db");
-  const repos = new Map<string, Set<string>>();
-  for (const p of packages) {
-    if (!p.path.startsWith(coPath)) {
-      continue;
-    }
-    const [repo, ref] = p.path.slice(coPath.length + 1).split(path.sep);
-    const refs = repos.get(repo);
-    if (refs) {
-      refs.add(ref);
-    } else {
-      repos.set(repo, new Set([ref]));
-    }
-  }
-
-  // we have to keep both the clone, and the checkout, removing either will
-  // trigger a rebuild
-
-  let dir: fs.Dir;
-  // clean the db
-  dir = await fs.promises.opendir(dbPath);
-  for await (const dirent of dir) {
-    if (!repos.has(dirent.name)) {
-      await rm(dir.path, dirent);
-    }
-  }
-
-  // clean the checkouts
-  dir = await fs.promises.opendir(coPath);
-  for await (const dirent of dir) {
-    const refs = repos.get(dirent.name);
-    if (!refs) {
-      await rm(dir.path, dirent);
-      continue;
-    }
-    if (!dirent.isDirectory()) {
-      continue;
-    }
-    const refsDir = await fs.promises.opendir(path.join(dir.path, dirent.name));
-    for await (const dirent of refsDir) {
-      if (!refs.has(dirent.name)) {
-        await rm(refsDir.path, dirent);
-      }
-    }
-  }
-}
-
 async function macOsWorkaround() {
   try {
     // Workaround for https://github.com/actions/cache/issues/403

src/utils.ts

@@ -0,0 +1,80 @@
+import * as core from "@actions/core";
+import * as exec from "@actions/exec";
+import fs from "fs";
+
+export function reportError(e: any) {
+  const { commandFailed } = e;
+  if (commandFailed) {
+    core.error(`Command failed: ${commandFailed.command}`);
+    core.error(commandFailed.stderr);
+  } else {
+    core.error(`${e.stack}`);
+  }
+}
+
+export async function getCmdOutput(cmdFormat: string, cmd: string, options: exec.ExecOptions = {}): Promise<string> {
+  cmd = cmdFormat.replace("{0}", cmd);
+  let stdout = "";
+  let stderr = "";
+  try {
+    await exec.exec(cmd, [], {
+      silent: true,
+      listeners: {
+        stdout(data) {
+          stdout += data.toString();
+        },
+        stderr(data) {
+          stderr += data.toString();
+        },
+      },
+      ...options,
+    });
+  } catch (e) {
+    (e as any).commandFailed = {
+      command: cmd,
+      stderr,
+    };
+    throw e;
+  }
+  return stdout;
+}
+
+export interface GhCache {
+  isFeatureAvailable: typeof import("@actions/cache").isFeatureAvailable;
+  restoreCache: typeof import("@actions/cache").restoreCache;
+  saveCache: (paths: string[], key: string) => Promise<string | number>;
+}
+
+export interface CacheProvider {
+  name: string;
+  cache: GhCache;
+}
+
+export async function getCacheProvider(): Promise<CacheProvider> {
+  const cacheProvider = core.getInput("cache-provider");
+  let cache: GhCache;
+  switch (cacheProvider) {
+    case "github":
+      cache = await import("@actions/cache");
+      break;
+    case "warpbuild":
+      cache = await import("@actions/warpbuild-cache");
+      break;
+    default:
+      throw new Error(`The \`cache-provider\` \`${cacheProvider}\` is not valid.`);
+  }
+
+  return {
+    name: cacheProvider,
+    cache: cache,
+  };
+}
+
+export async function exists(path: string) {
+  try {
+    await fs.promises.access(path);
+    return true;
+  } catch {
+    return false;
+  }
+}

src/workspace.ts

@@ -0,0 +1,65 @@
+import * as core from "@actions/core";
+import path from "path";
+
+import { getCmdOutput } from "./utils.js";
+
+const SAVE_TARGETS = new Set(["lib", "cdylib", "dylib", "rlib", "staticlib", "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}` : "");
+    let packages: Packages = [];
+    try {
+      core.debug(`collecting metadata for "${this.root}"`);
+      const meta: Meta = JSON.parse(
+        await getCmdOutput(cmdFormat, cmd, {
+          cwd: this.root,
+          env: { ...process.env, CARGO_ENCODED_RUSTFLAGS: "" },
+        }),
+      );
+      core.debug(`workspace "${this.root}" has ${meta.packages.length} packages`);
+      for (const pkg of meta.packages.filter(filter)) {
+        const targets = pkg.targets.filter((t) => t.kind.some((kind) => SAVE_TARGETS.has(kind))).map((t) => t.name);
+        packages.push({ name: pkg.name, version: pkg.version, targets, path: path.dirname(pkg.manifest_path) });
+      }
+    } catch (err) {
+      console.error(err);
+    }
+    return packages;
+  }
+
+  public async getPackagesOutsideWorkspaceRoot(cmdFormat: string): Promise<Packages> {
+    return await this.getPackages(cmdFormat, (pkg) => !pkg.manifest_path.startsWith(this.root));
+  }
+
+  public async getWorkspaceMembers(cmdFormat: string): Promise<Packages> {
+    return await this.getPackages(cmdFormat, (_) => true, "--no-deps");
+  }
+}
+
+export interface PackageDefinition {
+  name: string;
+  version: string;
+  path: string;
+  targets: Array<string>;
+}
+
+export type Packages = Array<PackageDefinition>;
+
+interface Meta {
+  packages: Array<{
+    name: string;
+    version: string;
+    manifest_path: string;
+    targets: Array<{ kind: Array<string>; name: string }>;
+  }>;
+}

tests/Cargo.toml

@@ -0,0 +1,17 @@
+[package]
+publish = false
+name = "rust-cache"
+version = "0.1.0"
+authors = ["Arpad Borsos <arpad.borsos@googlemail.com>"]
+edition = "2021"
+
+[dependencies]
+reqwest = "0.12.1"
+jsonpath_lib_polars_vendor = "0.0.1"
+watto = { git = "https://github.com/getsentry/watto", rev = "39ccb9add289c1f23c89f40506f4a80b2f4011b9", features = ["strings"] }
+
+[dev-dependencies]
+trybuild = "1"
+
+[target.'cfg(not(target_env = "msvc"))'.dependencies]
+tikv-jemallocator = "0.6.0"

tests/flake.nix

@@ -0,0 +1,31 @@
+{
+  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";
+        };
+      }
+    );
+}
+

tests/rust-toolchain/.keep

@@ -0,0 +1,2 @@
+the `rust-toolchain` directory will be globbed,
+and should not lead to any errors down the road

tests/src/main.rs

@@ -0,0 +1,25 @@
+#[cfg(not(target_env = "msvc"))]
+use tikv_jemallocator::Jemalloc;
+
+#[cfg(not(target_env = "msvc"))]
+#[global_allocator]
+static GLOBAL: Jemalloc = Jemalloc;
+
+fn main() {
+    println!("Hello, world!");
+}
+
+#[cfg(test)]
+fn some_fn(input: bool) -> usize {
+    if input {
+        2 + 4
+    } else {
+        3_usize.saturating_add(5)
+    }
+}
+
+#[test]
+fn some_test() {
+    assert_eq!(some_fn(true), 6);
+    assert_eq!(some_fn(false), 8);
+}

tests/tests/trybuild.rs

@@ -0,0 +1,6 @@
+#[test]
+fn test_trybuild() {
+    let t = trybuild::TestCases::new();
+    t.pass("tests/trybuild/empty_main.rs");
+    t.compile_fail("tests/trybuild/fail_to_compile.rs");
+}

tests/tests/trybuild/empty_main.rs

@@ -0,0 +1 @@
+fn main() {}

tests/tests/trybuild/fail_to_compile.rs

@@ -0,0 +1,3 @@
+fn main() {
+    "foobar".foobar();
+}

tests/tests/trybuild/fail_to_compile.stderr

@@ -0,0 +1,5 @@
+error[E0599]: no method named `foobar` found for reference `&'static str` in the current scope
+ --> tests/trybuild/fail_to_compile.rs:2:14
+  |
+2 |     "foobar".foobar();
+  |              ^^^^^^ method not found in `&'static str`

tests/wasm-workspace/.cargo/config.toml

@@ -0,0 +1,2 @@
+[build]
+target = "wasm32-unknown-unknown"

tests/wasm-workspace/Cargo.toml

@@ -0,0 +1,6 @@
+[workspace]
+resolver = "2"
+members = [
+    "crates/one",
+    "crates/two",
+]

tests/wasm-workspace/crates/one/Cargo.toml

@@ -0,0 +1,13 @@
+[package]
+publish = false
+name = "wasm-one"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+reqwest = "0.12"
+async-std = "1"
+tracing = "0.1"
+tracing-futures = "0.2"
+serde = "1"
+serde_json = "1"

tests/wasm-workspace/crates/two/Cargo.toml

@@ -0,0 +1,8 @@
+[package]
+publish = false
+name = "wasm-two"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+clap = "4"

tests/wasm-workspace/crates/two/src/main.rs

@@ -0,0 +1,3 @@
+fn main() {
+    println!("Hello, world!");
+}

tsconfig.json

@@ -2,20 +2,25 @@
   "compilerOptions": {
     "noEmitOnError": false,
     "diagnostics": true,
-    "lib": ["esnext"],
+    "lib": ["es2024"],
+    "types": ["node"],
 
-    "target": "es2020",
+    "target": "es2024",
 
     "resolveJsonModule": true,
-    "moduleResolution": "node",
-    "module": "esnext",
     "esModuleInterop": true,
 
+    "incremental": true,
+    "tsBuildInfoFile": ".build/tsconfig.build.tsbuildinfo",
+
     "strict": true,
     "skipLibCheck": true,
     "noUnusedLocals": true,
     "noUnusedParameters": true,
-    "noImplicitReturns": true
+    "noImplicitReturns": true,
+
+    "outDir": ".build"
   },
+  "include": ["src", "rollup.config.ts"],
   "exclude": ["dist"]
 }