Skip to content

Commit

Permalink
CI: Simplify addressing of CI errors (#657)
Browse files Browse the repository at this point in the history
Uniquely names artifacts for a matrix of jobs to so there's no conflicts
The changes will allow us to get out files across all logging levels and
precisions with one run rather than repeated runs and updates.
  • Loading branch information
Steven-Roberts authored Jan 29, 2025
1 parent b2db253 commit f33b6d7
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/check-format.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ jobs:
./scripts/format.sh CMakeLists.txt benchmarks cmake examples include src test
- name: Run git diff to see if anything changed
run: /usr/bin/git diff --name-only --exit-code
run: /usr/bin/git diff --exit-code

- name: Run git diff if we failed
if: failure()
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/check-spelling.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
./scripts/spelling.sh
- name: Run git diff to see if anything changed
run: /usr/bin/git diff --name-only --exit-code
run: /usr/bin/git diff --exit-code

- name: Run git diff if we failed
if: failure()
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/check-swig.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:
make all64
- name: Run git diff to see if anything changed
run: /usr/bin/git diff --name-only --exit-code
run: /usr/bin/git diff --exit-code

- name: Run git diff if we failed
if: failure()
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/test-address-sanitizer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ jobs:
image: ghcr.io/llnl/sundials-ci-int${{ matrix.indexsize }}-${{ matrix.precision }}:latest
options: --user root
strategy:
fail-fast: false
max-parallel: 2
matrix:
indexsize: [32, 64]
Expand All @@ -46,14 +47,14 @@ jobs:
uses: actions/upload-artifact@v4
if: failure()
with:
name: build_files
name: build_files_${{ matrix.indexsize }}_${{ matrix.precision }}_${{ matrix.buildtype }}_${{ matrix.tpls }}
path: |
${{ github.workspace }}/test/build_*
!${{ github.workspace }}/test/build_*/Testing/output
- name: Archive output files from failed build
uses: actions/upload-artifact@v4
if: failure()
with:
name: output_files
name: output_files_${{ matrix.indexsize }}_${{ matrix.precision }}_${{ matrix.buildtype }}_${{ matrix.tpls }}
path: |
${{ github.workspace }}/test/build_*/Testing/
8 changes: 4 additions & 4 deletions .github/workflows/ubuntu-clang-latest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ jobs:
uses: actions/upload-artifact@v4
if: failure()
with:
name: build_files
name: build_files_logging_level_${{ matrix.logging_level }}
path: |
${{ github.workspace }}/build
!${{ github.workspace }}/build/Testing/output
Expand All @@ -70,7 +70,7 @@ jobs:
uses: actions/upload-artifact@v4
if: failure()
with:
name: output_files
name: output_files_logging_level_${{ matrix.logging_level }}
path: |
${{ github.workspace }}/build/Testing/
Expand Down Expand Up @@ -104,7 +104,7 @@ jobs:
uses: actions/upload-artifact@v4
if: failure()
with:
name: build_files
name: build_files_profiling_${{ matrix.profiling }}
path: |
${{ github.workspace }}/build
!${{ github.workspace }}/build/Testing/output
Expand All @@ -113,6 +113,6 @@ jobs:
uses: actions/upload-artifact@v4
if: failure()
with:
name: output_files
name: output_files_profiling_${{ matrix.profiling }}
path: |
${{ github.workspace }}/build/Testing/
5 changes: 3 additions & 2 deletions .github/workflows/ubuntu-latest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ jobs:
image: ghcr.io/llnl/sundials-ci-int${{ matrix.indexsize }}-${{ matrix.precision }}:latest
options: --user root
strategy:
fail-fast: false
max-parallel: 2
matrix:
indexsize: [32, 64]
Expand Down Expand Up @@ -57,14 +58,14 @@ jobs:
uses: actions/upload-artifact@v4
if: failure()
with:
name: build_files
name: build_files_${{ matrix.indexsize }}_${{ matrix.precision }}_${{ matrix.buildtype }}_${{ matrix.tpls }}
path: |
${{ github.workspace }}/test/build_*
!${{ github.workspace }}/test/build_*/Testing/output
- name: Archive output files from failed build
uses: actions/upload-artifact@v4
if: failure()
with:
name: output_files
name: output_files_${{ matrix.indexsize }}_${{ matrix.precision }}_${{ matrix.buildtype }}_${{ matrix.tpls }}
path: |
${{ github.workspace }}/test/build_*/Testing/

0 comments on commit f33b6d7

Please sign in to comment.