Skip to content
Merged
Prev Previous commit
Next Next commit
work on fixing errors
  • Loading branch information
dmitry-shibanov committed Nov 9, 2021
commit 0860a2dc2d8f981827d1de874b63e97aad8271f2
10 changes: 2 additions & 8 deletions .github/workflows/e2e-cache.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@ jobs:
python-version: ['3.7', '3.8', '3.9', 'pypy-3.7-v7.3.5', 'pypy-3.7-v7.x', 'pypy-2.7-v7.3.4']
steps:
- uses: actions/checkout@v2
- name: Clean global cache
run: pip cache purge
- name: Setup Python
uses: ./
with:
Expand All @@ -50,8 +48,7 @@ jobs:
python-version: ${{ matrix.python-version }}
cache: 'pipenv'
- name: Install dependencies
run: pipenv install
working-directory: __tests__/data
run: pipenv install flake8

python-pip-depencies-caching-path:
name: Test pip (Python ${{ matrix.python-version}}, ${{ matrix.os }})
Expand All @@ -63,8 +60,6 @@ jobs:
python-version: ['3.7', '3.8', '3.9', 'pypy-3.7-v7.3.5', 'pypy-3.7-v7.x', 'pypy-2.7-v7.3.4']
steps:
- uses: actions/checkout@v2
- name: Clean global cache
run: pip cache purge
- name: Setup Python
uses: ./
with:
Expand Down Expand Up @@ -93,5 +88,4 @@ jobs:
cache: 'pipenv'
cache-dependency-path: '**/requirements-linux.txt'
- name: Install dependencies
run: pipenv install
working-directory: __tests__/data
run: pipenv install flake8
5 changes: 4 additions & 1 deletion src/cache-distributions/cache-distributor.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,10 @@ export enum State {

abstract class CacheDistributor {
protected CACHE_KEY_PREFIX = 'setup-python';
constructor(protected packageManager: string, protected cacheDependencyPath: string) {}
constructor(
protected packageManager: string,
protected cacheDependencyPath: string
) {}

protected abstract getCacheGlobalDirectories(): Promise<string[]>;
protected abstract computeKeys(): Promise<{
Expand Down
10 changes: 6 additions & 4 deletions src/cache-save.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,16 @@ export async function run() {
}

async function saveCache(packageManager: string) {
const cachePaths = JSON.parse(
core.getState(State.CACHE_PATHS)
) as string[];
const cachePaths = JSON.parse(core.getState(State.CACHE_PATHS)) as string[];

core.debug(`paths for caching are ${cachePaths.join(', ')}`);

if (!isCacheDirectoryExists(cachePaths)) {
throw new Error(`Cache folder path is retrieved for ${packageManager} but doesn't exist on disk: ${cachePaths.join(', ')}`);
throw new Error(
`Cache folder path is retrieved for ${packageManager} but doesn't exist on disk: ${cachePaths.join(
', '
)}`
);
}

const primaryKey = core.getState(State.STATE_CACHE_PRIMARY_KEY);
Expand Down