Harden primer package caching against possible race condition

Refs #9925 (comment)
pylint-dev · Sep 18, 2024 · 093b27f · 093b27f
1 parent 67acc96
commit 093b27f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/.github/workflows/primer_run_main.yaml b/.github/workflows/primer_run_main.yaml
@@ -78,7 +78,10 @@ jobs:
             ${{ runner.os }}-${{ matrix.python-version }}-${{
             steps.commitstring.outputs.commitstring }}-primer
       - name: Regenerate cache
-        if: steps.cache-projects.outputs.cache-hit != 'true'
+        # Presence of colorama is a heuristic for the env having all packages
+        if:
+          steps.cache-projects.outputs.cache-hit != 'true' || (. venv/bin/activate && !
+          python -m pip show colorama)
         run: |
           . venv/bin/activate
           python tests/primer/__main__.py prepare --clone

diff --git a/.github/workflows/primer_run_pr.yaml b/.github/workflows/primer_run_pr.yaml
@@ -147,7 +147,10 @@ jobs:
             ${{ runner.os }}-${{ matrix.python-version }}-${{
             steps.commitstring.outputs.commitstring }}-primer
       - name: Regenerate cache
-        if: steps.cache-projects.outputs.cache-hit != 'true'
+        # Presence of colorama is a heuristic for the env having all packages
+        if:
+          steps.cache-projects.outputs.cache-hit != 'true' || (. venv/bin/activate && !
+          python -m pip show colorama)
         run: |
           . venv/bin/activate
           python tests/primer/__main__.py prepare --clone