From 67534516c73d8ac63ec7e2b2c3459c6150171f41 Mon Sep 17 00:00:00 2001 From: Massimiliano Culpo Date: Thu, 8 Sep 2022 19:58:53 +0200 Subject: ci: avoid running coverage on package only PRs (#32573) * ci: remove !docs from "core" filters Written like it is now it causes package only PRs to run with coverage. * Try to skip job under condition, see if the workflow proceed * Try to cancel a running CI job * Simplify linux unit-tests, skip windows unit-tests on package PRs * Reduce the inputs to unit-tests workflow * Move control logic to main workflow, remove inputs * Revert "Move control logic to main workflow, remove inputs" This reverts commit 0c46fece4c49eb7a37585ec3ba651a31d7f958af. * Do not compute "with_coverage" since it's always == to "core" * Remove workflow dispatch from unit tests * Revert "Revert "Move control logic to main workflow, remove inputs"" This reverts commit dd4e4a4e61a825901e736348fd044d37e88c90b5. * Try to skip all from the main workflow * Add back bootstrap to needed checks for "all" * Restore the correct logic for conditionals --- .github/workflows/ci.yaml | 23 ++--------------------- 1 file changed, 2 insertions(+), 21 deletions(-) (limited to '.github/workflows/ci.yaml') diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index f4943789d6..3e74129656 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -19,12 +19,12 @@ jobs: needs: [ changes ] uses: ./.github/workflows/valid-style.yml with: - with_coverage: ${{ needs.changes.outputs.with_coverage }} + with_coverage: ${{ needs.changes.outputs.core }} audit-ancient-python: uses: ./.github/workflows/audit.yaml needs: [ changes ] with: - with_coverage: ${{ needs.changes.outputs.with_coverage }} + with_coverage: ${{ needs.changes.outputs.core }} python_version: 2.7 all-prechecks: needs: [ prechecks ] @@ -40,7 +40,6 @@ jobs: bootstrap: ${{ steps.filter.outputs.bootstrap }} core: ${{ steps.filter.outputs.core }} packages: ${{ steps.filter.outputs.packages }} - with_coverage: ${{ steps.coverage.outputs.with_coverage }} steps: - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # @v2 if: ${{ github.event_name == 'push' }} @@ -65,7 +64,6 @@ jobs: - 'share/spack/**' - '.github/workflows/bootstrap.yml' core: - - '!lib/spack/docs/**' - './!(var/**)/**' packages: - 'var/**' @@ -75,18 +73,6 @@ jobs: # job outputs: https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions#jobsjob_idoutputs # setting environment variables from earlier steps: https://docs.github.com/en/actions/reference/workflow-commands-for-github-actions#setting-an-environment-variable # - - id: coverage - # Run the subsequent jobs with coverage if core has been modified, - # regardless of whether this is a pull request or a push to a branch - run: | - echo Core changes: ${{ steps.filter.outputs.core }} - echo Event name: ${{ github.event_name }} - if [ "${{ steps.filter.outputs.core }}" == "true" ] - then - echo "::set-output name=with_coverage::true" - else - echo "::set-output name=with_coverage::false" - fi bootstrap: if: ${{ github.repository == 'spack/spack' && needs.changes.outputs.bootstrap == 'true' }} needs: [ prechecks, changes ] @@ -95,10 +81,6 @@ jobs: if: ${{ github.repository == 'spack/spack' && needs.changes.outputs.core == 'true' }} needs: [ prechecks, changes ] uses: ./.github/workflows/unit_tests.yaml - with: - core: ${{ needs.changes.outputs.core }} - packages: ${{ needs.changes.outputs.packages }} - with_coverage: ${{ needs.changes.outputs.with_coverage }} windows: if: ${{ github.repository == 'spack/spack' && needs.changes.outputs.core == 'true' }} needs: [ prechecks ] @@ -109,4 +91,3 @@ jobs: steps: - name: Success run: "true" - -- cgit v1.2.3-70-g09d2