Tweak how CMake is run in CI

This commit is contained in:
Oliver Hamlet
2025-01-15 18:21:51 +00:00
parent 9b6ec47709
commit 1e57ea1a39
2 changed files with 17 additions and 12 deletions
+11 -8
View File
@@ -63,10 +63,11 @@ jobs:
- name: Run CMake
run: |
mkdir build
cd build
cmake .. -DBOOST_ROOT="${{ steps.get-boost.outputs.root }}" -DCPACK_PACKAGE_VERSION="${{ steps.get-libloot-version.outputs.version }}"
make all
cmake \
-DBOOST_ROOT="${{ steps.get-boost.outputs.root }}" \
-DCPACK_PACKAGE_VERSION="${{ steps.get-libloot-version.outputs.version }}" \
-B build
cmake --build build
- name: Run tests
run: ctest --test-dir build --output-on-failure
@@ -157,10 +158,12 @@ jobs:
- name: Run CMake
run: |
mkdir build
cd build
cmake .. -G "Visual Studio 16 2019" -A ${{ matrix.platform }} -DBOOST_ROOT="${{ steps.get-boost.outputs.root }}" -DCPACK_PACKAGE_VERSION="${{ steps.get-libloot-version.outputs.version }}"
cmake --build . --config ${{ env.MSVC_CONFIG }}
cmake -G "Visual Studio 16 2019" `
-A ${{ matrix.platform }} `
-DBOOST_ROOT="${{ steps.get-boost.outputs.root }}" `
-DCPACK_PACKAGE_VERSION="${{ steps.get-libloot-version.outputs.version }}" `
-B build
cmake --build build --config ${{ env.MSVC_CONFIG }}
- name: Run tests
run: ctest --test-dir build --build-config ${{ env.MSVC_CONFIG }} --output-on-failure
+6 -4
View File
@@ -73,10 +73,12 @@ jobs:
- name: Run CMake
run: |
mkdir build
cd build
cmake .. -G "Visual Studio 16 2019" -A ${{ matrix.platform }} -DBOOST_ROOT="${{ steps.get-boost.outputs.root }}" -DCPACK_PACKAGE_VERSION="${{ needs.create_release.outputs.git_tag }}"
cmake --build . --config ${{ env.MSVC_CONFIG }}
cmake -G "Visual Studio 16 2019" `
-A ${{ matrix.platform }} `
-DBOOST_ROOT="${{ steps.get-boost.outputs.root }}" `
-DCPACK_PACKAGE_VERSION="${{ needs.create_release.outputs.git_tag }}" `
-B build
cmake --build build --config ${{ env.MSVC_CONFIG }}
- uses: actions/setup-python@v5
with: