Move control logic to main workflow, remove inputs
This commit is contained in:
parent
a2329ef42b
commit
0c46fece4c
8
.github/workflows/ci.yaml
vendored
8
.github/workflows/ci.yaml
vendored
@ -91,17 +91,13 @@ jobs:
|
||||
needs: [ prechecks, changes ]
|
||||
uses: ./.github/workflows/bootstrap.yml
|
||||
unit-tests:
|
||||
if: ${{ github.repository == 'spack/spack' && needs.changes.outputs.core == 'true' }}
|
||||
if: ${{ github.repository == 'spack/spack' && needs.changes.outputs.core == 'false' }}
|
||||
needs: [ prechecks, changes ]
|
||||
uses: ./.github/workflows/unit_tests.yaml
|
||||
with:
|
||||
core: ${{ needs.changes.outputs.core }}
|
||||
windows:
|
||||
if: ${{ github.repository == 'spack/spack' && needs.changes.outputs.core == 'true' }}
|
||||
if: ${{ github.repository == 'spack/spack' && needs.changes.outputs.core == 'false' }}
|
||||
needs: [ prechecks ]
|
||||
uses: ./.github/workflows/windows_python.yml
|
||||
with:
|
||||
core: ${{ needs.changes.outputs.core }}
|
||||
all:
|
||||
needs: [ windows, unit-tests, bootstrap, audit-ancient-python ]
|
||||
runs-on: ubuntu-latest
|
||||
|
17
.github/workflows/unit_tests.yaml
vendored
17
.github/workflows/unit_tests.yaml
vendored
@ -2,17 +2,7 @@ name: unit tests
|
||||
|
||||
on:
|
||||
workflow_dispatch:
|
||||
inputs:
|
||||
core:
|
||||
description: "If false the test is skipped"
|
||||
required: true
|
||||
type: string
|
||||
default: "true"
|
||||
workflow_call:
|
||||
inputs:
|
||||
core:
|
||||
required: true
|
||||
type: string
|
||||
|
||||
concurrency:
|
||||
group: unit_tests-${{github.ref}}-${{github.event.pull_request.number || github.run_number}}
|
||||
@ -21,7 +11,6 @@ concurrency:
|
||||
jobs:
|
||||
# Run unit tests with different configurations on linux
|
||||
ubuntu:
|
||||
if: ${{ inputs.core == 'false' }}
|
||||
runs-on: ubuntu-latest
|
||||
strategy:
|
||||
matrix:
|
||||
@ -123,11 +112,10 @@ jobs:
|
||||
. .github/workflows/setup_git.sh
|
||||
- name: Run shell tests
|
||||
env:
|
||||
COVERAGE: ${{ inputs.core }}
|
||||
COVERAGE: true
|
||||
run: |
|
||||
share/spack/qa/run-shell-tests
|
||||
- uses: codecov/codecov-action@81cd2dc8148241f03f5839d295e000b8f761e378 # @v2.1.0
|
||||
if: ${{ inputs.core == 'true' }}
|
||||
with:
|
||||
flags: shelltests,linux
|
||||
|
||||
@ -135,7 +123,6 @@ jobs:
|
||||
# only on PRs modifying core Spack
|
||||
rhel8-platform-python:
|
||||
runs-on: ubuntu-latest
|
||||
if: ${{ inputs.core == 'false' }}
|
||||
container: registry.access.redhat.com/ubi8/ubi
|
||||
steps:
|
||||
- name: Install dependencies
|
||||
@ -159,7 +146,6 @@ jobs:
|
||||
spack unit-test -k 'not cvs and not svn and not hg' -x --verbose
|
||||
# Test for the clingo based solver (using clingo-cffi)
|
||||
clingo-cffi:
|
||||
if: ${{ inputs.core == 'false' }}
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # @v2
|
||||
@ -196,7 +182,6 @@ jobs:
|
||||
flags: unittests,linux,clingo
|
||||
# Run unit tests on MacOS
|
||||
macos:
|
||||
if: ${{ inputs.core == 'false' }}
|
||||
runs-on: macos-latest
|
||||
strategy:
|
||||
matrix:
|
||||
|
8
.github/workflows/windows_python.yml
vendored
8
.github/workflows/windows_python.yml
vendored
@ -2,10 +2,6 @@ name: windows
|
||||
|
||||
on:
|
||||
workflow_call:
|
||||
inputs:
|
||||
core:
|
||||
type: string
|
||||
required: true
|
||||
|
||||
concurrency:
|
||||
group: windows-${{github.ref}}-${{github.event.pull_request.number || github.run_number}}
|
||||
@ -17,7 +13,6 @@ defaults:
|
||||
powershell Invoke-Expression -Command ".\share\spack\qa\windows_test_setup.ps1"; {0}
|
||||
jobs:
|
||||
unit-tests:
|
||||
if: ${{ inputs.core == 'false' }}
|
||||
runs-on: windows-latest
|
||||
steps:
|
||||
- uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
|
||||
@ -37,7 +32,6 @@ jobs:
|
||||
echo F|xcopy .\spack\share\spack\qa\configuration\windows_config.yaml $env:USERPROFILE\.spack\windows\config.yaml
|
||||
spack unit-test --verbose --ignore=lib/spack/spack/test/cmd
|
||||
unit-tests-cmd:
|
||||
if: ${{ inputs.core == 'false' }}
|
||||
runs-on: windows-latest
|
||||
steps:
|
||||
- uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
|
||||
@ -76,7 +70,6 @@ jobs:
|
||||
spack external find ninja
|
||||
spack install abseil-cpp
|
||||
make-installer:
|
||||
if: ${{ inputs.core == 'false' }}
|
||||
runs-on: windows-latest
|
||||
steps:
|
||||
- name: Disable Windows Symlinks
|
||||
@ -112,7 +105,6 @@ jobs:
|
||||
name: Windows Spack Installer
|
||||
path: ${{ env.installer_root}}\pkg\Spack.msi
|
||||
execute-installer:
|
||||
if: ${{ inputs.core == 'false' }}
|
||||
needs: make-installer
|
||||
runs-on: windows-latest
|
||||
defaults:
|
||||
|
Loading…
Reference in New Issue
Block a user