Skip to content

Commit 248b2f9

Browse files
committed
adjust CI builds
* split up build and test process * build and run tests twice - once from regular build folder - once from demo Signed-off-by: Steffen Jaeckel <[email protected]>
1 parent 67d9862 commit 248b2f9

File tree

1 file changed

+16
-4
lines changed

1 file changed

+16
-4
lines changed

.github/workflows/main.yml

+16-4
Original file line numberDiff line numberDiff line change
@@ -156,9 +156,9 @@ jobs:
156156
cc: [ clang, gcc ]
157157
config:
158158
# Static library build
159-
- { CMAKEOPTIONS: '', TARGET: 'check' }
159+
- { CMAKEOPTIONS: '', }
160160
# Shared library build
161-
- { CMAKEOPTIONS: '-DBUILD_SHARED_LIBS=On', TARGET: 'check'}
161+
- { CMAKEOPTIONS: '-DBUILD_SHARED_LIBS=On' }
162162
steps:
163163
- uses: actions/checkout@v2
164164
- name: install dependencies
@@ -169,5 +169,17 @@ jobs:
169169
run: |
170170
mkdir build
171171
cd build
172-
CC=${{ matrix.cc }} cmake ${{ matrix.config.CMAKEOPTIONS }} ${{ matrix.build_type }} ..
173-
make -j$(nproc) ${{ matrix.config.TARGET }}
172+
CC=${{ matrix.cc }} cmake ${{ matrix.config.CMAKEOPTIONS }} ${{ matrix.build_type }} ..
173+
make -j$(nproc)
174+
- name: test
175+
run: |
176+
CC=${{ matrix.cc }} cmake ${{ matrix.config.CMAKEOPTIONS }} ${{ matrix.build_type }} -DBUILD_TESTING=On ..
177+
make -j$(nproc)
178+
ctest
179+
- name: test (in demo folder)
180+
run: |
181+
mkdir ../demo/build
182+
cd ../demo/build
183+
CC=${{ matrix.cc }} cmake ${{ matrix.config.CMAKEOPTIONS }} ${{ matrix.build_type }} ..
184+
make -j$(nproc)
185+
ctest

0 commit comments

Comments
 (0)