Add caching to CI. (quantumlib#4999)

* Add caching to CI. * Fix windows caching issues.
95-martin-orion · Mar 2, 2022 · a224793 · a224793
1 parent b6fa6b8
commit a224793
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 8 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -158,9 +158,13 @@ jobs:
       - name: Force old pip (3.6 only)
         if: matrix.python-version == '3.6'
         run: pip install pip==20.2
+      - uses: actions/cache@v2
+        with:
+          path: ${{ env.pythonLocation }}
+          key: ${{ env.pythonLocation }}-${{ hashFiles('setup.py') }}-${{ hashFiles('dev-requirements.txt') }}
       - name: Install requirements
         run: |
-          pip install -r dev_tools/requirements/dev.env.txt
+          pip install --upgrade --upgrade-strategy eager -r dev_tools/requirements/dev.env.txt
       - name: Run Quil dependencies
         run: docker-compose -f cirq-rigetti/docker-compose.test.yaml up -d
       - name: Pytest check
@@ -208,8 +212,12 @@ jobs:
         with:
           python-version: '3.8'
           architecture: 'x64'
+      - uses: actions/cache@v2
+        with:
+          path: ${{ env.pythonLocation }}
+          key: ${{ env.pythonLocation }}-${{ hashFiles('setup.py') }}-${{ hashFiles('dev-requirements.txt') }}
       - name: Install requirements
-        run: pip install -r dev_tools/requirements/dev.env.txt
+        run: pip install --upgrade --upgrade-strategy eager -r dev_tools/requirements/dev.env.txt
       - name: Run Quil dependencies
         run: docker-compose -f cirq-rigetti/docker-compose.test.yaml up -d
       - name: Coverage check
@@ -228,10 +236,16 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
           architecture: 'x64'
+      - uses: actions/cache@v2
+        with:
+          path: ${{ env.pythonLocation }}
+          key: ${{ env.pythonLocation }}-${{ hashFiles('setup.py') }}-${{ hashFiles('dev-requirements.txt') }}
       - name: Install requirements
-        run: pip install -r dev_tools/requirements/no-contrib.env.txt
+        run: pip install --upgrade --upgrade-strategy eager -r dev_tools/requirements/no-contrib.env.txt
       - name: Pytest Windows
-        run: check/pytest --ignore=cirq-core/cirq/contrib --actually-quiet
+        run: |
+          source dev_tools/pypath
+          check/pytest --ignore=cirq-core/cirq/contrib --actually-quiet
         shell: bash
   macos:
     name: Pytest MacOS
@@ -245,8 +259,12 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
           architecture: 'x64'
+      - uses: actions/cache@v2
+        with:
+          path: ${{ env.pythonLocation }}
+          key: ${{ env.pythonLocation }}-${{ hashFiles('setup.py') }}-${{ hashFiles('dev-requirements.txt') }}
       - name: Install requirements
-        run: pip install -r dev_tools/requirements/no-contrib.env.txt
+        run: pip install --upgrade --upgrade-strategy eager -r dev_tools/requirements/no-contrib.env.txt
       - name: Pytest check
         run: check/pytest --ignore=cirq-core/cirq/contrib
   notebooks-stable:

diff --git a/cirq-rigetti/docker-compose.test.yaml b/cirq-rigetti/docker-compose.test.yaml
@@ -2,7 +2,7 @@ version: '3'
 
 services:
   quilc:
-    image: rigetti/quilc
+    image: rigetti/quilc:1.23.0
     command: -S
     expose:
       - "5555"
@@ -12,7 +12,7 @@ services:
       - test
 
   qvm:
-    image: rigetti/qvm
+    image: rigetti/qvm:1.17.1
     command: -S
     expose:
       - "5000"

diff --git a/dev_tools/pypath b/dev_tools/pypath
@@ -28,7 +28,7 @@ fi
 
 _PYPATH_PREFIX="${_PYPATH_BASE_DIR}$(
     cd "${_PYPATH_BASE_DIR}" &&
-        env PYTHONPATH=. python3 dev_tools/modules.py list --mode folder |
+        env PYTHONPATH=. python dev_tools/modules.py list --mode folder |
         xargs printf ":${_PYPATH_BASE_DIR}/%s"
 )"