Skip to content

Commit 77ad624

Browse files
authored
Merge pull request #26 from ECP-VeloC/actions-refactor
actions: refactor to configure/build/test steps
2 parents afc29d1 + c850766 commit 77ad624

1 file changed

Lines changed: 13 additions & 8 deletions

File tree

.github/workflows/build-and-test.yml

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,16 @@ jobs:
1616
os: [ubuntu-latest, macos-latest]
1717
target: [Debug, Release]
1818
mpi: [seq, par]
19+
static: [both, static]
1920

20-
name: ${{ matrix.os }}-${{ matrix.target }}-${{ matrix.mpi }}
21+
name: ${{ matrix.os }}-${{ matrix.target }}-${{ matrix.mpi }}-${{ matrix.static }}
2122

2223
runs-on: ${{ matrix.os }}
2324

2425
steps:
2526

2627
- name: checkout
27-
uses: actions/checkout@v2
28+
uses: actions/checkout@v3
2829
with:
2930
path: spath
3031
fetch-depth: 0
@@ -35,16 +36,20 @@ jobs:
3536
os: ${{ matrix.os }}
3637
mpi: ${{ matrix.mpi }}
3738

38-
- name: build static
39-
uses: ecp-veloc/github-actions/cmake-build-static@main
39+
- name: configure
40+
uses: ecp-veloc/github-actions/cmake-configure@main
4041
with:
4142
component: spath
4243
target: ${{ matrix.target }}
4344
cmake_line: "-DMPI=${{ matrix.mpi == 'par' }}"
45+
static: ${{ matrix.static == 'static' }}
4446

45-
- name: build and test
46-
uses: ecp-veloc/github-actions/cmake-build-test@main
47+
- name: build
48+
uses: ecp-veloc/github-actions/cmake-build@main
49+
with:
50+
component: spath
51+
52+
- name: test
53+
uses: ecp-veloc/github-actions/cmake-test@main
4754
with:
4855
component: spath
49-
target: ${{ matrix.target }}
50-
cmake_line: "-DMPI=${{ matrix.mpi == 'par' }}"

0 commit comments

Comments
 (0)