From e6881433cbda197c9814856b55b81ae1dd56f37b Mon Sep 17 00:00:00 2001
From: Jason Lawrence <jjlawren@users.noreply.github.com>
Date: Thu, 3 Dec 2020 11:03:01 -0600
Subject: [PATCH] Create cached venvs on demand

---
 .github/workflows/ci.yaml | 53 +++++++++------------------------------
 1 file changed, 12 insertions(+), 41 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 1d0f986d..a9aac9bd 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -14,41 +14,6 @@ env:
   DEFAULT_PYTHON: 3.7
 
 jobs:
-  prepare-venv:
-    name: Prepare Python ${{ matrix.python-version }} virtual environment
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        python-version: [3.6, 3.7, 3.8, 3.9]
-    steps:
-    - name: Check out code from GitHub
-      uses: actions/checkout@v2
-
-    - name: Set up Python ${{ matrix.python-version }}
-      id: python
-      uses: actions/setup-python@v2
-      with:
-        python-version: ${{ matrix.python-version }}
-
-    - name: Restore Python virtual environment
-      id: cache-venv
-      uses: actions/cache@v2
-      with:
-        path: venv
-        key: ${{ env.CACHE_VERSION}}-${{ runner.os }}-venv-${{ steps.python.outputs.python-version }}-${{ hashFiles('requirements_dev.txt') }}
-        restore-keys: |
-          ${{ env.CACHE_VERSION}}-${{ runner.os }}-venv-${{ steps.python.outputs.python-version }}-
-
-    - name: Create Python virtual environment
-      if: steps.cache-venv.outputs.cache-hit != 'true'
-      run: |
-        python -m venv venv
-        . venv/bin/activate
-        pip install -U pip
-        pip install -r requirements_dev.txt
-        pip install -e .
-
-
   lint-flake8:
     name: Check flake8
     needs: prepare-venv
@@ -75,11 +40,14 @@ jobs:
         restore-keys: |
           ${{ env.CACHE_VERSION}}-${{ runner.os }}-venv-${{ steps.python.outputs.python-version }}-
 
-    - name: Fail job if Python cache restore failed
+    - name: Create Python ${{ env.DEFAULT_PYTHON}} virtual environment
       if: steps.cache-venv.outputs.cache-hit != 'true'
       run: |
-        echo "Failed to restore Python virtual environment from cache"
-        exit 1
+        python -m venv venv
+        . venv/bin/activate
+        pip install -U pip
+        pip install -r requirements_dev.txt
+        pip install -e .
 
     - name: Lint with flake8
       run: |
@@ -130,11 +98,14 @@ jobs:
         restore-keys: |
           ${{ env.CACHE_VERSION}}-${{ runner.os }}-venv-${{ steps.python.outputs.python-version }}-
 
-    - name: Fail job if Python cache restore failed
+    - name: Create Python ${{ matrix.python-version }} virtual environment
       if: steps.cache-venv.outputs.cache-hit != 'true'
       run: |
-        echo "Failed to restore Python virtual environment from cache"
-        exit 1
+        python -m venv venv
+        . venv/bin/activate
+        pip install -U pip
+        pip install -r requirements_dev.txt
+        pip install -e .
 
     - name: Get PMS Docker image digest
       id: docker-digest