Skip to content

V mpantic/restore cache fix #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

V mpantic/restore cache fix #1

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5d72232
add restore cache error handling
panticmilos Jun 14, 2022
d91db0f
apply linter
panticmilos Jun 14, 2022
eb962b9
update e2e
panticmilos Jun 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/workflows/e2e-cache.yml
View file
Original file line number Diff line number Diff line change
@@ -43,12 +43,13 @@ jobs:
steps:
- uses: actions/checkout@v3
- name: Setup Python
id: setup-python
uses: ./
with:
python-version: ${{ matrix.python-version }}
cache: 'pipenv'
- name: Install pipenv
run: pipx install pipenv
run: pipx install pipenv --python ${{ steps.setup-python.outputs.python-path }}
- name: Install dependencies
run: |
cd __tests__/data
16 changes: 14 additions & 2 deletions dist/cache-save/index.js
View file
Original file line number Diff line number Diff line change
@@ -57529,8 +57529,20 @@ class CacheDistributor {
const cachePath = yield this.getCacheGlobalDirectories();
core.saveState(State.CACHE_PATHS, cachePath);
core.saveState(State.STATE_CACHE_PRIMARY_KEY, primaryKey);
const matchedKey = yield cache.restoreCache(cachePath, primaryKey, restoreKey);
this.handleMatchResult(matchedKey, primaryKey);
try {
const matchedKey = yield cache.restoreCache(cachePath, primaryKey, restoreKey);
this.handleMatchResult(matchedKey, primaryKey);
}
catch (error) {
const typedError = error;
if (typedError.name === cache.ValidationError.name) {
throw error;
}
else {
core.warning(typedError.message);
core.setOutput('cache-hit', false);
}
}
});
}
handleMatchResult(matchedKey, primaryKey) {
16 changes: 14 additions & 2 deletions dist/setup/index.js
View file
Original file line number Diff line number Diff line change
@@ -63600,8 +63600,20 @@ class CacheDistributor {
const cachePath = yield this.getCacheGlobalDirectories();
core.saveState(State.CACHE_PATHS, cachePath);
core.saveState(State.STATE_CACHE_PRIMARY_KEY, primaryKey);
const matchedKey = yield cache.restoreCache(cachePath, primaryKey, restoreKey);
this.handleMatchResult(matchedKey, primaryKey);
try {
const matchedKey = yield cache.restoreCache(cachePath, primaryKey, restoreKey);
this.handleMatchResult(matchedKey, primaryKey);
}
catch (error) {
const typedError = error;
if (typedError.name === cache.ValidationError.name) {
throw error;
}
else {
core.warning(typedError.message);
core.setOutput('cache-hit', false);
}
}
});
}
handleMatchResult(matchedKey, primaryKey) {
22 changes: 16 additions & 6 deletions src/cache-distributions/cache-distributor.ts
View file
Original file line number Diff line number Diff line change
@@ -35,13 +35,23 @@ abstract class CacheDistributor {
core.saveState(State.CACHE_PATHS, cachePath);
core.saveState(State.STATE_CACHE_PRIMARY_KEY, primaryKey);

const matchedKey = await cache.restoreCache(
cachePath,
primaryKey,
restoreKey
);
try {
const matchedKey = await cache.restoreCache(
cachePath,
primaryKey,
restoreKey
);

this.handleMatchResult(matchedKey, primaryKey);
this.handleMatchResult(matchedKey, primaryKey);
} catch (error) {
const typedError = error as Error;
if (typedError.name === cache.ValidationError.name) {
throw error;
} else {
core.warning(typedError.message);
core.setOutput('cache-hit', false);
}
}
}

public handleMatchResult(matchedKey: string | undefined, primaryKey: string) {