diff --git a/README.md b/README.md index 3025b9c..86af5ee 100644 --- a/README.md +++ b/README.md @@ -93,7 +93,6 @@ The following optimizations and considerations are taken into account when cachi crate, a checkout will be performed on-demand. - The `/registry` directory is _cleaned_ before saving the cache. This includes removing `src`, `.cache`, and any other unnecessary files. - - Registry artifacts older than 14 days will be removed. - `/target/debug` - Only the `debug` profile is cached, as this profile is typically used for formatting, linting, and testing. diff --git a/package.json b/package.json index 47fb993..b8df3da 100644 --- a/package.json +++ b/package.json @@ -1,11 +1,11 @@ { "name": "@moonrepo/setup-rust", - "version": "0.4.2", + "version": "0.4.1", "description": "A GitHub action for setting up Rust and Cargo.", "main": "dist/index.js", "scripts": { "build": "ncc build ./index.ts && ncc build ./post.ts --out ./dist/post", - "check": "pnpm run lint && pnpm run typecheck", + "check": "npm run lint && npm run typecheck", "lint": "eslint --ext .ts,.js --fix .", "typecheck": "tsc --noEmit" }, diff --git a/src/cargo.ts b/src/cargo.ts index 6e4c9aa..89543eb 100644 --- a/src/cargo.ts +++ b/src/cargo.ts @@ -7,7 +7,7 @@ import * as core from '@actions/core'; import * as exec from '@actions/exec'; import * as glob from '@actions/glob'; import * as tc from '@actions/tool-cache'; -import { padDate, rmrf } from './helpers'; +import { rmrf } from './fs'; import { RUST_HASH, RUST_VERSION } from './rust'; export const CARGO_HOME = process.env.CARGO_HOME ?? path.join(os.homedir(), '.cargo'); @@ -129,19 +129,7 @@ export async function cleanCargoRegistry() { const registryDir = path.join(CARGO_HOME, 'registry'); // .cargo/registry/src - Delete entirely - const staleDate = new Date(); - - // eslint-disable-next-line no-magic-numbers - staleDate.setDate(staleDate.getDate() - 14); - - await exec.exec('cargo', [ - 'cache', - '--autoclean', - '--remove-if-older-than', - `${staleDate.getFullYear()}.${padDate(staleDate.getMonth() + 1)}.${padDate( - staleDate.getDate(), - )}`, - ]); + await exec.exec('cargo', ['cache', '--autoclean']); // .cargo/registry/index - Delete .cache directories const indexDir = path.join(registryDir, 'index'); diff --git a/src/helpers.ts b/src/fs.ts similarity index 75% rename from src/helpers.ts rename to src/fs.ts index 0d5b27d..31454d2 100644 --- a/src/helpers.ts +++ b/src/fs.ts @@ -10,7 +10,3 @@ export async function rmrf(dir: string) { core.warning(`Failed to delete ${dir}: ${error}`); } } - -export function padDate(value: number) { - return String(value).padStart(2, '0'); -}