Reduce the inputs to unit-tests workflow

This commit is contained in:
Massimiliano Culpo 2022-09-08 10:21:01 +02:00
parent 3efa8b4d16
commit a2329ef42b
2 changed files with 13 additions and 20 deletions

View File

@ -96,8 +96,6 @@ jobs:
uses: ./.github/workflows/unit_tests.yaml uses: ./.github/workflows/unit_tests.yaml
with: with:
core: ${{ needs.changes.outputs.core }} core: ${{ needs.changes.outputs.core }}
packages: ${{ needs.changes.outputs.packages }}
with_coverage: ${{ needs.changes.outputs.with_coverage }}
windows: windows:
if: ${{ github.repository == 'spack/spack' && needs.changes.outputs.core == 'true' }} if: ${{ github.repository == 'spack/spack' && needs.changes.outputs.core == 'true' }}
needs: [ prechecks ] needs: [ prechecks ]

View File

@ -2,17 +2,17 @@ name: unit tests
on: on:
workflow_dispatch: workflow_dispatch:
inputs:
core:
description: "If false the test is skipped"
required: true
type: string
default: "true"
workflow_call: workflow_call:
inputs: inputs:
core: core:
required: true required: true
type: string type: string
packages:
required: true
type: string
with_coverage:
required: true
type: string
concurrency: concurrency:
group: unit_tests-${{github.ref}}-${{github.event.pull_request.number || github.run_number}} group: unit_tests-${{github.ref}}-${{github.event.pull_request.number || github.run_number}}
@ -21,7 +21,7 @@ concurrency:
jobs: jobs:
# Run unit tests with different configurations on linux # Run unit tests with different configurations on linux
ubuntu: ubuntu:
if: ${{ inputs.with_coverage == 'false' }} if: ${{ inputs.core == 'false' }}
runs-on: ubuntu-latest runs-on: ubuntu-latest
strategy: strategy:
matrix: matrix:
@ -121,18 +121,13 @@ jobs:
# Need this for the git tests to succeed. # Need this for the git tests to succeed.
git --version git --version
. .github/workflows/setup_git.sh . .github/workflows/setup_git.sh
- name: Run shell tests (without coverage) - name: Run shell tests
if: ${{ inputs.with_coverage == 'false' }}
run: |
share/spack/qa/run-shell-tests
- name: Run shell tests (with coverage)
if: ${{ inputs.with_coverage == 'true' }}
env: env:
COVERAGE: true COVERAGE: ${{ inputs.core }}
run: | run: |
share/spack/qa/run-shell-tests share/spack/qa/run-shell-tests
- uses: codecov/codecov-action@81cd2dc8148241f03f5839d295e000b8f761e378 # @v2.1.0 - uses: codecov/codecov-action@81cd2dc8148241f03f5839d295e000b8f761e378 # @v2.1.0
if: ${{ inputs.with_coverage == 'true' }} if: ${{ inputs.core == 'true' }}
with: with:
flags: shelltests,linux flags: shelltests,linux
@ -140,7 +135,7 @@ jobs:
# only on PRs modifying core Spack # only on PRs modifying core Spack
rhel8-platform-python: rhel8-platform-python:
runs-on: ubuntu-latest runs-on: ubuntu-latest
if: ${{ inputs.with_coverage == 'false' }} if: ${{ inputs.core == 'false' }}
container: registry.access.redhat.com/ubi8/ubi container: registry.access.redhat.com/ubi8/ubi
steps: steps:
- name: Install dependencies - name: Install dependencies
@ -164,7 +159,7 @@ jobs:
spack unit-test -k 'not cvs and not svn and not hg' -x --verbose spack unit-test -k 'not cvs and not svn and not hg' -x --verbose
# Test for the clingo based solver (using clingo-cffi) # Test for the clingo based solver (using clingo-cffi)
clingo-cffi: clingo-cffi:
if: ${{ inputs.with_coverage == 'false' }} if: ${{ inputs.core == 'false' }}
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # @v2 - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # @v2
@ -201,7 +196,7 @@ jobs:
flags: unittests,linux,clingo flags: unittests,linux,clingo
# Run unit tests on MacOS # Run unit tests on MacOS
macos: macos:
if: ${{ inputs.with_coverage == 'false' }} if: ${{ inputs.core == 'false' }}
runs-on: macos-latest runs-on: macos-latest
strategy: strategy:
matrix: matrix: