Fix CircleCI cache (#24880)

* fix

* fix

---------

Co-authored-by: ydshieh <ydshieh@users.noreply.github.com>
This commit is contained in:
Yih-Dar 2023-07-18 13:45:00 +02:00 committed by GitHub
parent ca974aff0f
commit f14c7f999d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 16 deletions

View File

@ -136,20 +136,20 @@ jobs:
- checkout - checkout
- restore_cache: - restore_cache:
keys: keys:
- v0.7-code_quality-{{ checksum "setup.py" }} - v0.7-code_quality-pip-{{ checksum "setup.py" }}
- v0.7-code-quality - v0.7-code-quality-pip
- restore_cache: - restore_cache:
keys: keys:
- v0.7-code_quality-{{ checksum "setup.py" }}-site-packages - v0.7-code_quality-site-packages-{{ checksum "setup.py" }}
- v0.7-code-quality-site-packages - v0.7-code-quality-site-packages
- run: pip install --upgrade --upgrade-strategy eager pip - run: pip install --upgrade --upgrade-strategy eager pip
- run: pip install -U --upgrade-strategy eager .[all,quality] - run: pip install -U --upgrade-strategy eager .[all,quality]
- save_cache: - save_cache:
key: v0.7-code_quality-{{ checksum "setup.py" }} key: v0.7-code_quality-pip-{{ checksum "setup.py" }}
paths: paths:
- '~/.cache/pip' - '~/.cache/pip'
- save_cache: - save_cache:
key: v0.7-code_quality-{{ checksum "setup.py" }}-site-packages key: v0.7-code_quality-site-packages-{{ checksum "setup.py" }}
paths: paths:
- '~/.pyenv/versions/' - '~/.pyenv/versions/'
- run: - run:
@ -177,20 +177,20 @@ jobs:
- checkout - checkout
- restore_cache: - restore_cache:
keys: keys:
- v0.7-repository_consistency-{{ checksum "setup.py" }} - v0.7-repository_consistency-pip-{{ checksum "setup.py" }}
- v0.7-repository_consistency - v0.7-repository_consistency-pip
- restore_cache: - restore_cache:
keys: keys:
- v0.7-repository_consistency-{{ checksum "setup.py" }}-site-packages - v0.7-repository_consistency-site-packages-{{ checksum "setup.py" }}
- v0.7-repository_consistency-site-packages - v0.7-repository_consistency-site-packages
- run: pip install --upgrade --upgrade-strategy eager pip - run: pip install --upgrade --upgrade-strategy eager pip
- run: pip install -U --upgrade-strategy eager .[all,quality] - run: pip install -U --upgrade-strategy eager .[all,quality]
- save_cache: - save_cache:
key: v0.7-repository_consistency-{{ checksum "setup.py" }} key: v0.7-repository_consistency-pip-{{ checksum "setup.py" }}
paths: paths:
- '~/.cache/pip' - '~/.cache/pip'
- save_cache: - save_cache:
key: v0.7-repository_consistency-{{ checksum "setup.py" }}-site-packages key: v0.7-repository_consistency-site-packages-{{ checksum "setup.py" }}
paths: paths:
- '~/.pyenv/versions/' - '~/.pyenv/versions/'
- run: - run:

View File

@ -101,16 +101,16 @@ class CircleCIJob:
{ {
"restore_cache": { "restore_cache": {
"keys": [ "keys": [
f"v{self.cache_version}-{self.cache_name}-" + '{{ checksum "setup.py" }}', f"v{self.cache_version}-{self.cache_name}-pip-" + '{{ checksum "setup.py" }}',
f"v{self.cache_version}-{self.cache_name}-", f"v{self.cache_version}-{self.cache_name}-pip-",
] ]
} }
}, },
{ {
"restore_cache": { "restore_cache": {
"keys": [ "keys": [
f"v{self.cache_version}-{self.cache_name}-" + '{{ checksum "setup.py" }}-site-packages', f"v{self.cache_version}-{self.cache_name}-site-packages-" + '{{ checksum "setup.py" }}',
f"v{self.cache_version}-{self.cache_name}-site-packages", f"v{self.cache_version}-{self.cache_name}-site-packages-",
] ]
} }
}, },
@ -119,7 +119,7 @@ class CircleCIJob:
steps.append( steps.append(
{ {
"save_cache": { "save_cache": {
"key": f"v{self.cache_version}-{self.cache_name}-" + '{{ checksum "setup.py" }}', "key": f"v{self.cache_version}-{self.cache_name}-pip-" + '{{ checksum "setup.py" }}',
"paths": ["~/.cache/pip"], "paths": ["~/.cache/pip"],
} }
} }
@ -127,7 +127,7 @@ class CircleCIJob:
steps.append( steps.append(
{ {
"save_cache": { "save_cache": {
"key": f"v{self.cache_version}-{self.cache_name}-" + '{{ checksum "setup.py" }}-site-packages', "key": f"v{self.cache_version}-{self.cache_name}-site-packages-" + '{{ checksum "setup.py" }}',
"paths": ["~/.pyenv/versions/"], "paths": ["~/.pyenv/versions/"],
} }
} }