diff options
-rw-r--r-- | .github/workflows/checks.yaml | 24 | ||||
-rw-r--r-- | .github/workflows/primer-test.yaml | 12 | ||||
-rw-r--r-- | .github/workflows/primer_comment.yaml | 6 | ||||
-rw-r--r-- | .github/workflows/tests.yaml | 12 |
4 files changed, 9 insertions, 45 deletions
diff --git a/.github/workflows/checks.yaml b/.github/workflows/checks.yaml index 3b85768ae..b4e367f45 100644 --- a/.github/workflows/checks.yaml +++ b/.github/workflows/checks.yaml @@ -99,25 +99,17 @@ jobs: uses: actions/cache@v3.2.4 with: path: venv + fail-on-cache-miss: true key: ${{ runner.os }}-${{ steps.python.outputs.python-version }}-${{ needs.prepare-base.outputs.python-key }} - - name: Fail job if Python cache restore failed - if: steps.cache-venv.outputs.cache-hit != 'true' - run: | - echo "Failed to restore Python venv from cache" - exit 1 - name: Restore pre-commit environment id: cache-precommit uses: actions/cache@v3.2.4 with: path: ${{ env.PRE_COMMIT_CACHE }} + fail-on-cache-miss: true key: ${{ runner.os }}-${{ needs.prepare-base.outputs.pre-commit-key }} - - name: Fail job if pre-commit cache restore failed - if: steps.cache-precommit.outputs.cache-hit != 'true' - run: | - echo "Failed to restore pre-commit environment from cache" - exit 1 - name: Install enchant and aspell run: | sudo apt-get update @@ -148,14 +140,10 @@ jobs: uses: actions/cache@v3.2.4 with: path: venv + fail-on-cache-miss: true key: ${{ runner.os }}-${{ steps.python.outputs.python-version }}-${{ needs.prepare-base.outputs.python-key }} - - name: Fail job if Python cache restore failed - if: steps.cache-venv.outputs.cache-hit != 'true' - run: | - echo "Failed to restore Python venv from cache" - exit 1 - name: Run spelling checks run: | . venv/bin/activate @@ -180,14 +168,10 @@ jobs: uses: actions/cache@v3.2.4 with: path: venv + fail-on-cache-miss: true key: ${{ runner.os }}-${{ steps.python.outputs.python-version }}-${{ needs.prepare-base.outputs.python-key }} - - name: Fail job if Python cache restore failed - if: steps.cache-venv.outputs.cache-hit != 'true' - run: | - echo "Failed to restore Python venv from cache" - exit 1 - name: Install tox run: | pip install -U tox diff --git a/.github/workflows/primer-test.yaml b/.github/workflows/primer-test.yaml index b5890ab6a..5922a6bec 100644 --- a/.github/workflows/primer-test.yaml +++ b/.github/workflows/primer-test.yaml @@ -86,14 +86,10 @@ jobs: uses: actions/cache@v3.2.4 with: path: venv + fail-on-cache-miss: true key: ${{ runner.os }}-${{ steps.python.outputs.python-version }}-${{ needs.prepare-tests-linux.outputs.python-key }} - - name: Fail job if Python cache restore failed - if: steps.cache-venv.outputs.cache-hit != 'true' - run: | - echo "Failed to restore Python venv from cache" - exit 1 - name: Run pytest run: | . venv/bin/activate @@ -122,14 +118,10 @@ jobs: uses: actions/cache@v3.2.4 with: path: venv + fail-on-cache-miss: true key: ${{ runner.os }}-${{ steps.python.outputs.python-version }}-${{ needs.prepare-tests-linux.outputs.python-key }} - - name: Fail job if Python cache restore failed - if: steps.cache-venv.outputs.cache-hit != 'true' - run: | - echo "Failed to restore Python venv from cache" - exit 1 - name: Run pytest run: | . venv/bin/activate diff --git a/.github/workflows/primer_comment.yaml b/.github/workflows/primer_comment.yaml index 491ab49e7..45301fe30 100644 --- a/.github/workflows/primer_comment.yaml +++ b/.github/workflows/primer_comment.yaml @@ -44,15 +44,11 @@ jobs: uses: actions/cache@v3.2.4 with: path: venv + fail-on-cache-miss: true key: ${{ runner.os }}-${{ steps.python.outputs.python-version }}-${{ env.KEY_PREFIX }}-${{ env.CACHE_VERSION }}-${{ hashFiles('pyproject.toml', 'requirements_test.txt', 'requirements_test_min.txt') }} - - name: Fail job if Python cache restore failed - if: steps.cache-venv.outputs.cache-hit != 'true' - run: | - echo "Failed to restore Python venv from cache" - exit 1 - name: Download outputs uses: actions/github-script@v6.4.0 diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 6a7f20306..fd86cdfc9 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -95,14 +95,10 @@ jobs: uses: actions/cache@v3.2.4 with: path: venv + fail-on-cache-miss: true key: ${{ runner.os }}-${{ steps.python.outputs.python-version }}-${{ needs.tests-linux.outputs.python-key }} - - name: Fail job if Python cache restore failed - if: steps.cache-venv.outputs.cache-hit != 'true' - run: | - echo "Failed to restore Python venv from cache" - exit 1 - name: Download all coverage artifacts uses: actions/download-artifact@v3.0.2 - name: Combine coverage results @@ -139,14 +135,10 @@ jobs: uses: actions/cache@v3.2.4 with: path: venv + fail-on-cache-miss: true key: ${{ runner.os }}-${{ steps.python.outputs.python-version }}-${{ needs.tests-linux.outputs.python-key }} - - name: Fail job if Python cache restore failed - if: steps.cache-venv.outputs.cache-hit != 'true' - run: | - echo "Failed to restore Python venv from cache" - exit 1 - name: Run pytest run: | . venv/bin/activate |