2.7.0

changelog
Support for trybuild and similar macro testing tools (#168 )
2025-12-27 01:53:59 -05:00 · 2023-09-12 19:34:11 +02:00 · 2023-09-12 19:34:01 +02:00 · 2023-09-12 19:32:03 +02:00 · 2023-08-24 15:18:39 +02:00 · 2023-08-20 10:28:01 +02:00
14 changed files with 2812 additions and 8418 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changelog

+## 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.
--- a/README.md
+++ b/README.md
@@ -67,7 +67,7 @@ sensible defaults.
    # default: "true"
    save-if: ""
    # To only cache runs from `master`:
-    save-if: ${{ github.ref == 'refs/head/master' }}
+    save-if: ${{ github.ref == 'refs/heads/master' }}

    # Specifies what to use as the backend providing cache
    # Can be set to either "github" or "buildjet"
--- a/dist/restore/index.js
+++ b/dist/restore/index.js
--- a/dist/save/index.js
+++ b/dist/save/index.js
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,21 +1,21 @@
 {
  "name": "rust-cache",
-  "version": "2.6.1",
+  "version": "2.7.0",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "rust-cache",
-      "version": "2.6.1",
+      "version": "2.7.0",
      "license": "LGPL-3.0",
      "dependencies": {
-        "@actions/buildjet-cache": "npm:github-actions.cache-buildjet@0.1.2",
-        "@actions/cache": "^3.2.1",
+        "@actions/buildjet-cache": "npm:github-actions.cache-buildjet@0.2.0",
+        "@actions/cache": "^3.2.2",
        "@actions/core": "^1.10.0",
        "@actions/exec": "^1.1.1",
        "@actions/glob": "^0.4.0",
        "@actions/io": "^1.1.3",
-        "toml": "^3.0.0"
+        "smol-toml": "^1.1.1"
      },
      "devDependencies": {
        "@vercel/ncc": "^0.36.1",
@@ -28,9 +28,9 @@
    },
    "node_modules/@actions/buildjet-cache": {
      "name": "github-actions.cache-buildjet",
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/github-actions.cache-buildjet/-/github-actions.cache-buildjet-0.1.2.tgz",
-      "integrity": "sha512-mBgIxCYgDDSzkCCK1/DbVF36K0k2uaSx+Dk4LANat8KMzq7XtYK96ZnS7/fOosqzjtK7AlZtXsBkOoY5NKlcHw==",
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/github-actions.cache-buildjet/-/github-actions.cache-buildjet-0.2.0.tgz",
+      "integrity": "sha512-Dm1ZL9EBRo3JOwQKrGodxlqRsmFKerhwZj8DYTnWiAIU+qgR4cV8le97Dw/grmBgnAvANNMQlRP6+sNE1auQ6g==",
      "dependencies": {
        "@actions/core": "^1.10.0",
        "@actions/exec": "^1.0.1",
@@ -51,14 +51,14 @@
      }
    },
    "node_modules/@actions/cache": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/@actions/cache/-/cache-3.2.1.tgz",
-      "integrity": "sha512-QurbMiY//02+0kN1adJkMHN44RcZ5kAXfhSnKUZmtSmhMTNqLitGArG1xOkt93NNyByTlLGAc5wIOF/dZ2ENOQ==",
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/@actions/cache/-/cache-3.2.2.tgz",
+      "integrity": "sha512-6D0Jq5JrLZRQ3VApeQwQkkV20ZZXjXsHNYXd9VjNUdi9E0h93wESpxfMJ2JWLCUCgHNLcfY0v3GjNM+2FdRMlg==",
      "dependencies": {
        "@actions/core": "^1.10.0",
        "@actions/exec": "^1.0.1",
        "@actions/glob": "^0.1.0",
-        "@actions/http-client": "^2.0.1",
+        "@actions/http-client": "^2.1.1",
        "@actions/io": "^1.0.1",
        "@azure/abort-controller": "^1.1.0",
        "@azure/ms-rest-js": "^2.6.0",
@@ -111,9 +111,9 @@
      }
    },
    "node_modules/@actions/http-client": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/@actions/http-client/-/http-client-2.1.0.tgz",
-      "integrity": "sha512-BonhODnXr3amchh4qkmjPMUO8mFi/zLaaCeCAJZqch8iQqyDnVIkySjB38VHAC8IJ+bnlgfOqlhpyCUZHlQsqw==",
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/@actions/http-client/-/http-client-2.1.1.tgz",
+      "integrity": "sha512-qhrkRMB40bbbLo7gF+0vu+X+UawOvQQqNAA/5Unx774RS8poaOhThDOG6BGmxvAnxhQnDp2BG/ZUm65xZILTpw==",
      "dependencies": {
        "tunnel": "^0.0.6"
      }
@@ -135,15 +135,16 @@
      }
    },
    "node_modules/@azure/core-auth": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/@azure/core-auth/-/core-auth-1.4.0.tgz",
-      "integrity": "sha512-HFrcTgmuSuukRf/EdPmqBrc5l6Q5Uu+2TbuhaKbgaCpP2TfAeiNaQPAadxO+CYBRHGUzIDteMAjFspFLDLnKVQ==",
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/@azure/core-auth/-/core-auth-1.5.0.tgz",
+      "integrity": "sha512-udzoBuYG1VBoHVohDTrvKjyzel34zt77Bhp7dQntVGGD0ehVq48owENbBG8fIgkHRNUBQH5k1r0hpoMu5L8+kw==",
      "dependencies": {
        "@azure/abort-controller": "^1.0.0",
+        "@azure/core-util": "^1.1.0",
        "tslib": "^2.2.0"
      },
      "engines": {
-        "node": ">=12.0.0"
+        "node": ">=14.0.0"
      }
    },
    "node_modules/@azure/core-http": {
@@ -229,9 +230,9 @@
      }
    },
    "node_modules/@azure/core-util": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/@azure/core-util/-/core-util-1.3.2.tgz",
-      "integrity": "sha512-2bECOUh88RvL1pMZTcc6OzfobBeWDBf5oBbhjIhT1MV9otMVWCzpOJkkiKtrnO88y5GGBelgY8At73KGAdbkeQ==",
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/@azure/core-util/-/core-util-1.4.0.tgz",
+      "integrity": "sha512-eGAyJpm3skVQoLiRqm/xPa+SXi/NPDdSHMxbRAz2lSprd+Zs+qrpQGQQ2VQ3Nttu+nSZR4XoYQC71LbEI7jsig==",
      "dependencies": {
        "@azure/abort-controller": "^1.0.0",
        "tslib": "^2.2.0"
@@ -306,9 +307,9 @@
      }
    },
    "node_modules/@types/node": {
-      "version": "20.4.5",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.4.5.tgz",
-      "integrity": "sha512-rt40Nk13II9JwQBdeYqmbn2Q6IVTA5uPhvSO+JVqdXw/6/4glI6oR9ezty/A9Hg5u7JH4OmYmuQ+XvjKm0Datg=="
+      "version": "20.5.1",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.5.1.tgz",
+      "integrity": "sha512-4tT2UrL5LBqDwoed9wZ6N3umC4Yhz3W3FloMmiiG4JwmUJWpie0c7lcnUNd4gtMKuDEO4wRVS8B6Xa0uMRsMKg=="
    },
    "node_modules/@types/node-fetch": {
      "version": "2.6.4",
@@ -472,9 +473,9 @@
      }
    },
    "node_modules/node-fetch": {
-      "version": "2.6.12",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.12.tgz",
-      "integrity": "sha512-C/fGU2E8ToujUivIO0H+tpQ6HWo4eEmchoPIoXtxCrVghxdKq+QOHqEZW7tuP3KlV3bC8FRMO5nMCC7Zm1VP6g==",
+      "version": "2.6.13",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.13.tgz",
+      "integrity": "sha512-StxNAxh15zr77QvvkmveSQ8uCQ4+v5FkvNTj0OESmiHu+VRi/gXArXtkWMElOsOUNLtUEvI4yS+rdtOHZTwlQA==",
      "dependencies": {
        "whatwg-url": "^5.0.0"
      },
@@ -511,10 +512,14 @@
        "semver": "bin/semver.js"
      }
    },
-    "node_modules/toml": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/toml/-/toml-3.0.0.tgz",
-      "integrity": "sha512-y/mWCZinnvxjTKYhJ+pYxwD0mRLVvOtdS2Awbgxln6iEnt4rk0yBxeSBHkGJcPucRiG0e55mwWp+g/05rsrd6w=="
+    "node_modules/smol-toml": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/smol-toml/-/smol-toml-1.1.1.tgz",
+      "integrity": "sha512-qyYMygHyDKiy82iiKTH/zXr0DZmEpsou0AMZnkXdYhA/0LhPLoZ/xHaOBrbecLbAJ/Gd5KhMWWH8TXtgv1g+DQ==",
+      "engines": {
+        "node": ">= 18",
+        "pnpm": ">= 8"
+      }
    },
    "node_modules/tr46": {
      "version": "0.0.3",
@@ -522,9 +527,9 @@
      "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="
    },
    "node_modules/tslib": {
-      "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.1.tgz",
-      "integrity": "sha512-t0hLfiEKfMUoqhG+U1oid7Pva4bbDPHYfJNiB7BiIjRkj1pyC++4N3huJfqY6aRH6VTB0rvtzQwjM4K6qpfOig=="
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
+      "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q=="
    },
    "node_modules/tunnel": {
      "version": "0.0.6",
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
  "private": true,
  "name": "rust-cache",
-  "version": "2.6.1",
+  "version": "2.7.0",
  "description": "A GitHub Action that implements smart caching for rust/cargo projects with sensible defaults.",
  "keywords": [
    "actions",
@@ -22,13 +22,13 @@
  },
  "homepage": "https://github.com/Swatinem/rust-cache#readme",
  "dependencies": {
-    "@actions/buildjet-cache": "npm:github-actions.cache-buildjet@0.1.2",
-    "@actions/cache": "^3.2.1",
+    "@actions/buildjet-cache": "npm:github-actions.cache-buildjet@0.2.0",
+    "@actions/cache": "^3.2.2",
    "@actions/core": "^1.10.0",
    "@actions/exec": "^1.1.1",
    "@actions/glob": "^0.4.0",
    "@actions/io": "^1.1.3",
-    "toml": "^3.0.0"
+    "smol-toml": "^1.1.1"
  },
  "devDependencies": {
    "@vercel/ncc": "^0.36.1",
--- a/src/cleanup.ts
+++ b/src/cleanup.ts
@@ -34,6 +34,26 @@ export async function cleanTargetDir(targetDir: string, packages: Packages, chec
 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);

--- a/src/config.ts
+++ b/src/config.ts
@@ -5,7 +5,7 @@ import fs from "fs";
 import fs_promises from "fs/promises";
 import os from "os";
 import path from "path";
-import * as toml from "toml";
+import * as toml from "smol-toml";

 import { getCargoBins } from "./cleanup";
 import { CacheProvider, getCmdOutput } from "./utils";
@@ -147,12 +147,13 @@ export class CacheConfig {
      for (const cargo_manifest of cargo_manifests) {
        try {
          const content = await fs_promises.readFile(cargo_manifest, { encoding: "utf8" });
-          const parsed = toml.parse(content);
+          // 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";
+              pack["version"] = "0.0.0";
            }
          }

@@ -205,7 +206,7 @@ export class CacheConfig {

          // Package without `[[package]].source` and `[[package]].checksum`
          // are the one with `path = "..."` to crates within the workspace.
-          const packages = parsed.package.filter((p: any) => "source" in p || "checksum" in p);
+          const packages = (parsed.package as any[]).filter((p: any) => "source" in p || "checksum" in p);

          hasher.update(JSON.stringify(packages));

--- a/tests/Cargo.lock
+++ b/tests/Cargo.lock
@@ -14,6 +14,15 @@ version = "0.21.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d"

+[[package]]
+name = "basic-toml"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7bfc506e7a2370ec239e1d072507b2a80c833083699d3c6fa176fbb4de8448c6"
+dependencies = [
+ "serde",
+]
+
 [[package]]
 name = "bitflags"
 version = "1.3.2"
@@ -148,6 +157,12 @@ dependencies = [
 "pin-utils",
 ]

+[[package]]
+name = "glob"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
+
 [[package]]
 name = "h2"
 version = "0.3.14"
@@ -524,6 +539,7 @@ version = "0.1.0"
 dependencies = [
 "reqwest",
 "tikv-jemallocator",
+ "trybuild",
 "watto",
 ]

@@ -568,9 +584,20 @@ dependencies = [

 [[package]]
 name = "serde"
-version = "1.0.144"
+version = "1.0.185"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f747710de3dcd43b88c9168773254e809d8ddbdf9653b84e2554ab219f17860"
+checksum = "be9b6f69f1dfd54c3b568ffa45c310d6973a5e5148fd40cf515acaf38cf5bc31"
+
+[[package]]
+name = "serde_derive"
+version = "1.0.147"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4f1d362ca8fc9c3e3a7484440752472d68a6caa98f1ab81d99b5dfe517cec852"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]

 [[package]]
 name = "serde_json"
@@ -639,6 +666,15 @@ dependencies = [
 "winapi",
 ]

+[[package]]
+name = "termcolor"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6"
+dependencies = [
+ "winapi-util",
+]
+
 [[package]]
 name = "thiserror"
 version = "1.0.33"
@@ -767,6 +803,21 @@ version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642"

+[[package]]
+name = "trybuild"
+version = "1.0.80"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "501dbdbb99861e4ab6b60eb6a7493956a9defb644fd034bc4a5ef27c693c8a3a"
+dependencies = [
+ "basic-toml",
+ "glob",
+ "once_cell",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "termcolor",
+]
+
 [[package]]
 name = "unicode-bidi"
 version = "0.3.8"
@@ -923,6 +974,15 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"

+[[package]]
+name = "winapi-util"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
+dependencies = [
+ "winapi",
+]
+
 [[package]]
 name = "winapi-x86_64-pc-windows-gnu"
 version = "0.4.0"
--- a/tests/Cargo.toml
+++ b/tests/Cargo.toml
@@ -9,5 +9,8 @@ edition = "2021"
 reqwest = "0.11.18"
 watto = { git = "https://github.com/getsentry/watto", rev = "d71c8218506bddba102a124a460d64da25e303dc", features = ["strings"] }

+[dev-dependencies]
+trybuild = "1"
+
 [target.'cfg(not(target_env = "msvc"))'.dependencies]
 tikv-jemallocator = "0.5.4"
--- a/tests/tests/trybuild.rs
+++ b/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");
+}
--- a/tests/tests/trybuild/empty_main.rs
+++ b/tests/tests/trybuild/empty_main.rs
@@ -0,0 +1 @@
+fn main() {}
--- a/tests/tests/trybuild/fail_to_compile.rs
+++ b/tests/tests/trybuild/fail_to_compile.rs
@@ -0,0 +1,3 @@
+fn main() {
+    "foobar".foobar();
+}
--- a/tests/tests/trybuild/fail_to_compile.stderr
+++ b/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 `&str`
Author	SHA1	Message	Date
Arpad Borsos	a95ba19544	2.7.0	2023-09-12 19:34:11 +02:00
Arpad Borsos	82c8487d00	changelog	2023-09-12 19:34:01 +02:00
Filippo Neysofu Costa	67c46e7159	Support for `trybuild` and similar macro testing tools (#168 ) Signed-off-by: Filippo Costa <filippo@neysofu.me>	2023-09-12 19:32:03 +02:00
Lucas Kent	44b6087283	Fix save-if documentation in readme (#166 )	2023-08-24 15:18:39 +02:00
Arpad Borsos	e207df5d26	2.6.2	2023-08-20 10:28:01 +02:00
Arpad Borsos	decb69d790	Update dependencies and add changelog	2023-08-20 10:27:32 +02:00
Jiahao XU	ab6b2769d1	dep: Use `smol-toml` instead of `toml` (#164 ) Fixed #162 #163 The former is listed on https://github.com/toml-lang/toml/wiki#implementations and is toml 1.0 compliant. Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>	2023-08-19 12:23:03 +02:00