mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-09-21 09:05:10 -07:00
tweak visual studio test build
This commit is contained in:
parent
ee2feb4c2a
commit
c9d5e4ebba
2 changed files with 6 additions and 6 deletions
|
|
@ -259,7 +259,7 @@ if [[ $RUNNER_OS == macOS ]]; then
|
|||
|
||||
elif [[ $RUNNER_OS == Windows ]]; then
|
||||
if [[ "$CMAKE_GENERATOR" =~ ^Visual\ Studio ]]; then
|
||||
# Enable MTT, see https://devblogs.microsoft.com/cppblog/improved-parallelism-in-msbuild/
|
||||
# Enable MSBuild switches for MTT, see https://devblogs.microsoft.com/cppblog/improved-parallelism-in-msbuild/
|
||||
# and https://devblogs.microsoft.com/cppblog/cpp-build-throughput-investigation-and-tune-up/#multitooltask-mtt
|
||||
buildflags+=(-- -p:UseMultiToolTask=true -p:EnableClServerMode=true)
|
||||
fi
|
||||
|
|
@ -275,15 +275,15 @@ fi
|
|||
echo "::group::Configure CMake"
|
||||
cmake --version
|
||||
if [[ "$CMAKE_GENERATOR" =~ ^Ninja ]]; then
|
||||
ninja --version
|
||||
echo "ninja $(ninja --version)"
|
||||
fi
|
||||
echo "Running cmake with flags: ${flags[*]}"
|
||||
echo "Running CMake with these flags: ${flags[*]}"
|
||||
cmake .. "${flags[@]}"
|
||||
echo "::endgroup::"
|
||||
|
||||
# Build
|
||||
echo "::group::Build project"
|
||||
echo "Running cmake --build with flags: ${buildflags[*]}"
|
||||
echo "Running CMake with these build flags: ${buildflags[*]}"
|
||||
cmake --build . --verbose "${buildflags[@]}"
|
||||
echo "::endgroup::"
|
||||
|
||||
|
|
|
|||
4
.github/workflows/desktop-build.yml
vendored
4
.github/workflows/desktop-build.yml
vendored
|
|
@ -338,7 +338,7 @@ jobs:
|
|||
cmake_generator: "Visual Studio 18 2026"
|
||||
cmake_generator_platform: x64
|
||||
make_package: 1
|
||||
package_suffix: "-Win10"
|
||||
package_suffix: "-Win10_VS"
|
||||
qt_version: 6.11.0
|
||||
qt_modules: qtimageformats qtmultimedia qtwebsockets
|
||||
type: Release
|
||||
|
|
@ -538,7 +538,7 @@ jobs:
|
|||
path: ${{ steps.build.outputs.path }}
|
||||
|
||||
- name: "[Windows] Upload PDBs (Program Databases)"
|
||||
if: matrix.os == 'Windows' && github.ref_type != 'tag'
|
||||
if: matrix.os == 'Windows' && github.ref_type != 'tag' && matrix.cmake_generator == 'Ninja'
|
||||
uses: actions/upload-artifact@v7
|
||||
with:
|
||||
if-no-files-found: error
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue