Disk cache garbage collection

README.md

@@ -83,33 +83,44 @@ Default `""`.
   ```
 </details>
 
-### `disk-cache`
-
-Enable [`disk_cache`][2] and store it on GitHub based on contents of `BUILD` files.
+### `cache-prefix`
 
-You can also pass a string to use as a cache key to separate caches from different workflows.
+Specify a prefix used for all caches.
 
-Default `false`.
+Default `${{ github.job }}-${{ runner.os }}`
 
 <details>
   <summary>Examples</summary>
 
-  #### Share a single disk cache
+  #### Using a job matrix
 
   ```yaml
-  - uses: bazel-contrib/[email protected]
-    with:
-      disk-cache: true
+  my-job:
+    strategy:
+      matrix:
+        os: [ubuntu-22.04, ubuntu-24.04]
+        mode: [dbg, opt]
+    runs-on: ${{ matrix.os }}
+    steps:
+      - uses: actions/checkout@v4
+      - uses: bazel-contrib/[email protected]
+        with:
+          cache-prefix: ${{ matrix.job }}-${{ matrix.os }}-${{ matrix.mode }}
   ```
+</details>
 
-  #### Separate disk caches between workflows
+### `disk-cache`
 
-  ```yaml
-  - uses: bazel-contrib/[email protected]
-    with:
-      disk-cache: ${{ github.workflow }}}
-  ```
-</details>
+Enable [`disk_cache`][2] and store it on GitHub.
+
+Default `false`.
+
+### `max-disk-cache-size`
+
+The maximum size, in GB, allowed for the disk cache.
+Exceeding this size results in garbage collection.
+
+Default `5`.
 
 ### `external-cache`
 
@@ -206,31 +217,16 @@ Default is one of the following:
 
 ### `repository-cache`
 
-Enable [`repository_cache`][3] and store it on GitHub based on contents of `MODULE.bazel` and `WORKSPACE` files.
-
-You can also pass a file (or list of files) which contents are used to calculate cache key.
+Enable [`repository_cache`][3] and store it on GitHub.
 
 Default `false`.
 
-<details>
-  <summary>Examples</summary>
+### `max-repository-cache-size`
 
-  #### Store a single repository cache
+The maximum size, in GB, allowed for the repository cache.
+Exceeding this size results in garbage collection.
 
-  ```yaml
-  - uses: bazel-contrib/[email protected]
-    with:
-      repository-cache: true
-  ```
-
-  #### Store a repository cache from a custom location
-
-  ```yaml
-  - uses: bazel-contrib/[email protected]
-    with:
-      repository-cache: examples/gem/WORKSPACE
-  ```
-</details>
+Default `1`.
 
 ## Migrating from [`bazelbuild/setup-bazelisk`][6]
 

action.yml

@@ -13,6 +13,10 @@ inputs:
     description: Extra contents to write to user .bazelrc
     required: false
     default: ""
+  cache-prefix:
+    description: Key prefix for all caches
+    required: false
+    default: ${{ github.job }}-${{ runner.os }}
   cache-version:
     description: Version of all caches
     required: false
@@ -21,6 +25,10 @@ inputs:
     description: Cache actions outputs based on BUILD
     required: false
     default: "false"
+  max-disk-cache-size:
+    description: Maximum disk cache size, in GB
+    required: false
+    default: 5
   external-cache:
     description: Cache external 10MB+ repositories based on MODULE.bazel/WORKSPACE
     required: false
@@ -41,6 +49,10 @@ inputs:
     description: Cache repositories based on MODULE.bazel/WORKSPACE
     required: false
     default: "false"
+  max-repository-cache-size:
+    description: Maximum repository cache size, in GB
+    required: false
+    default: 1
   token:
     description: GitHub token to query Bazelisk releases
     required: false

config.js

@@ -5,6 +5,7 @@ const core = require('@actions/core')
 const github = require('@actions/github')
 
 const bazeliskVersion = core.getInput('bazelisk-version')
+const cachePrefix = core.getInput('cache-prefix')
 const cacheVersion = core.getInput('cache-version')
 const externalCacheConfig = yaml.parse(core.getInput('external-cache'))
 const moduleRoot = core.getInput('module-root')
@@ -41,32 +42,19 @@ switch (platform) {
     break
 }
 
-const baseCacheKey = `setup-bazel-${cacheVersion}-${platform}`
+const baseCacheKey = `setup-bazel-${cacheVersion}-${cachePrefix}`
 const bazelrc = core.getMultilineInput('bazelrc')
 
-const diskCacheConfig = core.getInput('disk-cache')
-const diskCacheEnabled = diskCacheConfig !== 'false'
-let diskCacheName = 'disk'
+const diskCacheEnabled = core.getBooleanInput('disk-cache')
+const maxDiskCacheSize = core.getInput('max-disk-cache-size')
 if (diskCacheEnabled) {
   bazelrc.push(`common --disk_cache=${bazelDisk}`)
-  if (diskCacheName !== 'true') {
-    diskCacheName = `${diskCacheName}-${diskCacheConfig}`
-  }
 }
 
-const repositoryCacheConfig = core.getInput('repository-cache')
-const repositoryCacheEnabled = repositoryCacheConfig !== 'false'
-let repositoryCacheFiles = [
-  `${moduleRoot}/MODULE.bazel`,
-  `${moduleRoot}/WORKSPACE.bazel`,
-  `${moduleRoot}/WORKSPACE.bzlmod`,
-  `${moduleRoot}/WORKSPACE`
-]
+const repositoryCacheEnabled = core.getBooleanInput('repository-cache')
+const maxRepositoryCacheSize = core.getInput('max-repository-cache-size')
 if (repositoryCacheEnabled) {
   bazelrc.push(`common --repository_cache=${bazelRepository}`)
-  if (repositoryCacheConfig !== 'true') {
-    repositoryCacheFiles = Array(repositoryCacheConfig).flat()
-  }
 }
 
 const googleCredentials = core.getInput('google-credentials')
@@ -139,12 +127,8 @@ module.exports = {
   bazelrc,
   diskCache: {
     enabled: diskCacheEnabled,
-    files: [
-      ...repositoryCacheFiles,
-      `${moduleRoot}/**/BUILD.bazel`,
-      `${moduleRoot}/**/BUILD`
-    ],
-    name: diskCacheName,
+    maxSize: maxDiskCacheSize,
+    name: 'disk',
     paths: [bazelDisk]
   },
   externalCache,
@@ -159,7 +143,7 @@ module.exports = {
   },
   repositoryCache: {
     enabled: repositoryCacheEnabled,
-    files: repositoryCacheFiles,
+    maxSize: maxRepositoryCacheSize,
     name: 'repository',
     paths: [bazelRepository]
   },