Fix CircleCI cache (#24880)

* fix * fix --------- Co-authored-by: ydshieh <ydshieh@users.noreply.github.com>

Fix CircleCI cache (#24880)
* fix * fix --------- Co-authored-by: ydshieh <ydshieh@users.noreply.github.com>
f14c7f99 · Yih-Dar · GitHub · ca974aff · f14c7f99 · f14c7f99
Unverified Commit f14c7f99 authored Jul 18, 2023 by Yih-Dar Committed by GitHub Jul 18, 2023
Show whitespace changes
Inline Side-by-side

Showing with 16 additions and 16 deletions

.circleci/config.yml .circleci/config.yml +10 -10

.circleci/create_circleci_config.py .circleci/create_circleci_config.py +6 -6

No files found.
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -136,20 +136,20 @@ jobs:
            - checkout
            - restore_cache:
                  keys:
-                      - v0.7-code_quality-{{ checksum "setup.py" }}
-                      - v0.7-code-quality
+                      - v0.7-code_quality-pip-{{ checksum "setup.py" }}
+                      - v0.7-code-quality-pip
            - restore_cache:
                  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
            - run: pip install --upgrade --upgrade-strategy eager pip
            - run: pip install -U --upgrade-strategy eager .[all,quality]
            - save_cache:
-                  key: v0.7-code_quality-{{ checksum "setup.py" }}
+                  key: v0.7-code_quality-pip-{{ checksum "setup.py" }}
                  paths:
                      - '~/.cache/pip'
            - save_cache:
-                  key: v0.7-code_quality-{{ checksum "setup.py" }}-site-packages
+                  key: v0.7-code_quality-site-packages-{{ checksum "setup.py" }}
                  paths:
                      - '~/.pyenv/versions/'
            - run:
@@ -177,20 +177,20 @@ jobs:
            - checkout
            - restore_cache:
                  keys:
-                      - v0.7-repository_consistency-{{ checksum "setup.py" }}
-                      - v0.7-repository_consistency
+                      - v0.7-repository_consistency-pip-{{ checksum "setup.py" }}
+                      - v0.7-repository_consistency-pip
            - restore_cache:
                  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
            - run: pip install --upgrade --upgrade-strategy eager pip
            - run: pip install -U --upgrade-strategy eager .[all,quality]
            - save_cache:
-                  key: v0.7-repository_consistency-{{ checksum "setup.py" }}
+                  key: v0.7-repository_consistency-pip-{{ checksum "setup.py" }}
                  paths:
                      - '~/.cache/pip'
            - save_cache:
-                  key: v0.7-repository_consistency-{{ checksum "setup.py" }}-site-packages
+                  key: v0.7-repository_consistency-site-packages-{{ checksum "setup.py" }}
                  paths:
                      - '~/.pyenv/versions/'
            - run:

--- a/.circleci/create_circleci_config.py
+++ b/.circleci/create_circleci_config.py
@@ -101,16 +101,16 @@ class CircleCIJob:
            {
                "restore_cache": {
                    "keys": [
-                        f"v{self.cache_version}-{self.cache_name}-" + '{{ checksum "setup.py" }}',
-                        f"v{self.cache_version}-{self.cache_name}-",
+                        f"v{self.cache_version}-{self.cache_name}-pip-" + '{{ checksum "setup.py" }}',
+                        f"v{self.cache_version}-{self.cache_name}-pip-",
                    ]
                }
            },
            {
                "restore_cache": {
                    "keys": [
-                        f"v{self.cache_version}-{self.cache_name}-" + '{{ checksum "setup.py" }}-site-packages',
-                        f"v{self.cache_version}-{self.cache_name}-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-",
                    ]
                }
            },
@@ -119,7 +119,7 @@ class CircleCIJob:
        steps.append(
            {
                "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"],
                }
            }
@@ -127,7 +127,7 @@ class CircleCIJob:
        steps.append(
            {
                "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/"],
                }
            }