From 8f0a0b0eda11605aea32f2feb55056c981f66b7f Mon Sep 17 00:00:00 2001 From: Aarni Koskela Date: Fri, 10 Nov 2023 10:24:46 +0200 Subject: [PATCH] Add `cache-save: false` option --- __tests__/cache-save.test.ts | 16 ++++++++++++++-- action.yml | 3 +++ dist/cache-save/index.js | 20 +++++++++++++++++--- docs/advanced-usage.md | 36 ++++++++++++++++++++++++++++++++++++ src/cache-save.ts | 19 +++++++++++++++---- 5 files changed, 85 insertions(+), 9 deletions(-) diff --git a/__tests__/cache-save.test.ts b/__tests__/cache-save.test.ts index ae55ed1..bf77bcd 100644 --- a/__tests__/cache-save.test.ts +++ b/__tests__/cache-save.test.ts @@ -34,8 +34,8 @@ describe('run', () => { beforeEach(() => { process.env['RUNNER_OS'] = process.env['RUNNER_OS'] ?? 'linux'; - for(const key in process.env) { - if(key.startsWith('INPUT_')) { + for (const key in process.env) { + if (key.startsWith('INPUT_')) { delete process.env[key]; } } @@ -251,6 +251,18 @@ describe('run', () => { expect(saveCacheSpy).toHaveBeenCalled(); expect(setFailedSpy).not.toHaveBeenCalled(); }); + + it('should not save the cache when requested not to', async () => { + setInput('cache', 'pip'); + setInput('cache-save', 'false'); + setInput('python-version', '3.10.0'); + await run(); + expect(infoSpy).toHaveBeenCalledWith( + 'Not saving cache since `cache-save` is false' + ); + expect(saveCacheSpy).not.toHaveBeenCalled(); + expect(setFailedSpy).not.toHaveBeenCalled(); + }); }); afterEach(() => { diff --git a/action.yml b/action.yml index 5c46697..43ebb58 100644 --- a/action.yml +++ b/action.yml @@ -20,6 +20,9 @@ inputs: default: ${{ github.server_url == 'https://github.com' && github.token || '' }} cache-dependency-path: description: "Used to specify the path to dependency files. Supports wildcards or a list of file names for caching multiple dependencies." + cache-save: + description: "Set this option if you want the action to save the cache after the run. Defaults to true. It can be useful to set this to false if you have e.g. optional dependencies that only some workflows require, and they should not be cached." + default: true update-environment: description: "Set this option if you want the action to update environment variables." default: true diff --git a/dist/cache-save/index.js b/dist/cache-save/index.js index c042469..cd2332b 100644 --- a/dist/cache-save/index.js +++ b/dist/cache-save/index.js @@ -80475,9 +80475,23 @@ function run(earlyExit) { try { const cache = core.getInput('cache'); if (cache) { - yield saveCache(cache); - if (earlyExit) { - process.exit(0); + let shouldSave = true; + try { + shouldSave = core.getBooleanInput('cache-save', { required: false }); + } + catch (e) { + // If we fail to parse the input, assume it's + // > "Input does not meet YAML 1.2 "core schema" specification." + // and assume it's the `true` default. + } + if (shouldSave) { + yield saveCache(cache); + if (earlyExit) { + process.exit(0); + } + } + else { + core.info('Not saving cache since `cache-save` is false'); } } } diff --git a/docs/advanced-usage.md b/docs/advanced-usage.md index a3ae55c..9b97cc4 100644 --- a/docs/advanced-usage.md +++ b/docs/advanced-usage.md @@ -381,6 +381,42 @@ steps: # Or pip install -e '.[test]' to install test dependencies ``` +### Skipping cache saving + +For some scenarios, it may be useful to only save a given subset of dependencies, +but restore more of them for other workflows. For instance, there may be a heavy +`extras` dependency that you do not need your entire test matrix to download, but +you want to download and test it separately without it being saved in the cache +archive for all runs. + +To achieve this, you can use `cache-save: false` on the run that uses the heavy +dependency. + + +```yaml +test: + steps: + - uses: actions/checkout@v4 + - uses: actions/setup-python@v4 + with: + python-version: '3.11' + cache: 'pip' + cache-dependency-path: pyproject.toml + - run: pip install -e . + +test-heavy-extra: + steps: + - uses: actions/checkout@v4 + - uses: actions/setup-python@v4 + with: + python-version: '3.11' + cache: 'pip' + cache-dependency-path: pyproject.toml + cache-save: false + - run: pip install -e '.[heavy-extra]' +``` + + # Outputs and environment variables ## Outputs diff --git a/src/cache-save.ts b/src/cache-save.ts index fbb481c..e6e8480 100644 --- a/src/cache-save.ts +++ b/src/cache-save.ts @@ -11,10 +11,21 @@ export async function run(earlyExit?: boolean) { try { const cache = core.getInput('cache'); if (cache) { - await saveCache(cache); - - if (earlyExit) { - process.exit(0); + let shouldSave = true; + try { + shouldSave = core.getBooleanInput('cache-save', {required: false}); + } catch (e) { + // If we fail to parse the input, assume it's + // > "Input does not meet YAML 1.2 "core schema" specification." + // and assume it's the `true` default. + } + if (shouldSave) { + await saveCache(cache); + if (earlyExit) { + process.exit(0); + } + } else { + core.info('Not saving cache since `cache-save` is false'); } } } catch (error) {