From 8f6d36b0154ab0a0191c3be31ae907fd1217f137 Mon Sep 17 00:00:00 2001 From: Andrii Danylchenko Date: Sun, 3 Dec 2023 21:03:09 +0200 Subject: [PATCH] MSVC: switch to RelWithDebInfo --- .github/workflows/github.yml | 7 ++++++- CMakePresets.json | 3 +-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/github.yml b/.github/workflows/github.yml index 07dd4171b..a0f6b69a9 100644 --- a/.github/workflows/github.yml +++ b/.github/workflows/github.yml @@ -84,6 +84,7 @@ jobs: os: macos-12 test: 0 pack: 1 + pack_type: Release extension: dmg preset: macos-conan-ninja-release conan_profile: macos-intel @@ -93,6 +94,7 @@ jobs: os: macos-12 test: 0 pack: 1 + pack_type: Release extension: dmg preset: macos-arm-conan-ninja-release conan_profile: macos-arm @@ -102,6 +104,7 @@ jobs: os: macos-12 test: 0 pack: 1 + pack_type: Release extension: ipa preset: ios-release-conan-ccache conan_profile: ios-arm64 @@ -110,12 +113,14 @@ jobs: os: windows-latest test: 0 pack: 1 + pack_type: RelWithDebInfo extension: exe preset: windows-msvc-release-ccache - platform: mingw-ubuntu os: ubuntu-22.04 test: 0 pack: 1 + pack_type: Release extension: exe cpack_args: -D CPACK_NSIS_EXECUTABLE=`which makensis` cmake_args: -G Ninja @@ -246,7 +251,7 @@ jobs: run: | cd '${{github.workspace}}/out/build/${{matrix.preset}}' CPACK_PATH=`which -a cpack | grep -m1 -v -i chocolatey` - "$CPACK_PATH" -C ${{env.BUILD_TYPE}} ${{ matrix.cpack_args }} + "$CPACK_PATH" -C ${{matrix.pack_type}} ${{ matrix.cpack_args }} test -f '${{github.workspace}}/CI/${{matrix.platform}}/post_pack.sh' \ && '${{github.workspace}}/CI/${{matrix.platform}}/post_pack.sh' '${{github.workspace}}' "$(ls '${{ env.VCMI_PACKAGE_FILE_NAME }}'.*)" rm -rf _CPack_Packages diff --git a/CMakePresets.json b/CMakePresets.json index f43ac51ff..d96a905b0 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -327,8 +327,7 @@ { "name": "windows-msvc-release", "configurePreset": "windows-msvc-release", - "inherits": "default-release", - "configuration": "Release" + "inherits": "default-release" }, { "name": "windows-msvc-release-ccache",