summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.github/workflows/build_and_test.yml24
1 files changed, 5 insertions, 19 deletions
diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
index 543a7c3..e2590d3 100644
--- a/.github/workflows/build_and_test.yml
+++ b/.github/workflows/build_and_test.yml
@@ -24,19 +24,13 @@ jobs:
- uses: actions/checkout@v2
- name: Build
- if: runner.os != 'Windows'
- run: |
- cmake -D CMAKE_BUILD_TYPE=$BUILD_TYPE -B build -S .
- cmake --build build --config $BUILD_TYPE
-
- - name: Build with Visual Studio
- if: runner.os == 'Windows'
shell: bash
run: |
- cmake -B build -S .
+ cmake -D CMAKE_BUILD_TYPE=$BUILD_TYPE -B build -S .
cmake --build build --config $BUILD_TYPE
- name: Run tests
+ shell: bash
working-directory: ${{ github.workspace }}/build
run: |
ctest -V -C $BUILD_TYPE
@@ -53,22 +47,14 @@ jobs:
- uses: actions/checkout@v2
- name: Build
- if: runner.os != 'Windows'
- run: |
- cmake -D CMAKE_BUILD_TYPE=$BUILD_TYPE -B build -S .
- cmake --build build --config $BUILD_TYPE
- working-directory: ./source/test/integration/${{ matrix.name }}
-
- - name: Build with Visual Studio
- if: runner.os == 'Windows'
shell: bash
+ working-directory: ./source/test/integration/${{ matrix.name }}
run: |
- cmake -B build -S .
+ cmake -D CMAKE_BUILD_TYPE=$BUILD_TYPE -B build -S .
cmake --build build --config $BUILD_TYPE
- working-directory: ./source/test/integration/${{ matrix.name }}
- name: Run tests
shell: bash
+ working-directory: ./source/test/integration/${{ matrix.name }}/build
run: |
ctest -V -C $BUILD_TYPE
- working-directory: ./source/test/integration/${{ matrix.name }}/build