Harden primer package caching against possible race condition

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

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/.github/workflows/primer_run_main.yaml b/.github/workflows/primer_run_main.yaml
@@ -78,10 +78,16 @@ 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
         run: |
           . venv/bin/activate
-          python tests/primer/__main__.py prepare --clone
+          if echo ${{ steps.cache-projects.outputs.cache-hit }} | grep -c "true" && python -m pip show colorama
+          then
+            echo "Cache hit: skipping primer clone command"
+          else
+            python tests/primer/__main__.py prepare --clone
+          fi
+        shell: bash
       - name: Upload commit string
         uses: actions/[email protected]
         if: matrix.batchIdx == 0

diff --git a/.github/workflows/primer_run_pr.yaml b/.github/workflows/primer_run_pr.yaml
@@ -147,10 +147,16 @@ 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
         run: |
           . venv/bin/activate
-          python tests/primer/__main__.py prepare --clone
+          if echo ${{ steps.cache-projects.outputs.cache-hit }} | grep -c "true" && python -m pip show colorama
+          then
+            echo "Cache hit: skipping primer clone command"
+          else
+            python tests/primer/__main__.py prepare --clone
+          fi
+        shell: bash
       - name: Check cache
         run: |
           . venv/bin/activate