From 859745f1a92462fa21af54d80ad6a01cca484dd8 Mon Sep 17 00:00:00 2001 From: Gregory Becker Date: Fri, 26 Apr 2024 10:38:09 -0700 Subject: Run audits on windows Add debug log for external detection tests. The debug log is used to print which test is being executed. Skip version audit on Windows where appropriate --- .github/workflows/audit.yaml | 34 ++++++++++++++++++++++++++-------- 1 file changed, 26 insertions(+), 8 deletions(-) (limited to '.github/workflows') diff --git a/.github/workflows/audit.yaml b/.github/workflows/audit.yaml index de82a31c06..93e71537ef 100644 --- a/.github/workflows/audit.yaml +++ b/.github/workflows/audit.yaml @@ -17,10 +17,16 @@ concurrency: jobs: # Run audits on all the packages in the built-in repository package-audits: - runs-on: ${{ matrix.operating_system }} + runs-on: ${{ matrix.system.os }} strategy: matrix: - operating_system: ["ubuntu-latest", "macos-latest"] + system: + - { os: windows-latest, shell: 'powershell Invoke-Expression -Command "./share/spack/qa/windows_test_setup.ps1"; {0}' } + - { os: ubuntu-latest, shell: bash } + - { os: macos-latest, shell: bash } + defaults: + run: + shell: ${{ matrix.system.shell }} steps: - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 - uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d @@ -29,20 +35,32 @@ jobs: - name: Install Python packages run: | pip install --upgrade pip setuptools pytest coverage[toml] + - name: Setup for Windows run + if: runner.os == 'Windows' + run: | + python -m pip install --upgrade pywin32 - name: Package audits (with coverage) - if: ${{ inputs.with_coverage == 'true' }} + if: ${{ inputs.with_coverage == 'true' && runner.os != 'Windows' }} run: | . share/spack/setup-env.sh coverage run $(which spack) audit packages - coverage run $(which spack) -d audit externals + coverage run $(which spack) -d audit externals coverage combine coverage xml - name: Package audits (without coverage) - if: ${{ inputs.with_coverage == 'false' }} + if: ${{ inputs.with_coverage == 'false' && runner.os != 'Windows' }} run: | - . share/spack/setup-env.sh - $(which spack) audit packages - $(which spack) audit externals + . share/spack/setup-env.sh + spack -d audit packages + spack -d audit externals + - name: Package audits (without coverage) + if: ${{ runner.os == 'Windows' }} + run: | + . share/spack/setup-env.sh + spack -d audit packages + ./share/spack/qa/validate_last_exit.ps1 + spack -d audit externals + ./share/spack/qa/validate_last_exit.ps1 - uses: codecov/codecov-action@84508663e988701840491b86de86b666e8a86bed if: ${{ inputs.with_coverage == 'true' }} with: -- cgit v1.2.3-70-g09d2