From d11e5f2584cfe0c707a0acfa3bb2261e56a51a7a Mon Sep 17 00:00:00 2001 From: eugene Date: Thu, 26 Sep 2024 12:54:46 -0400 Subject: [PATCH] cleanup presets --- .github/workflows/cmake.yml | 8 ++++++-- CMakePresets.json | 38 ------------------------------------- 2 files changed, 6 insertions(+), 40 deletions(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index be9aa97..0924a09 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -98,21 +98,25 @@ jobs: cmake --build build - name: Test + env: + TLSUV_TEST_LOG: 7 run: | cd build ctest --output-on-failure --no-compress-output --output-junit TEST-results.xml -T test - name: Memory Check if: always() && matrix.os == 'ubuntu' + env: + TLSUV_TEST_LOG: 7 run: | cd build ctest --output-on-failure --no-compress-output --output-junit TEST-memcheck.xml -T memcheck - name: upload test summary if: always() - uses: test-summary/action@v2 + uses: mikepenz/action-junit-report@v4 with: - paths: ${{ github.workspace }}/build/TEST-*.xml + report_paths: ${{ github.workspace }}/build/TEST-*.xml - name: upload test report if: always() diff --git a/CMakePresets.json b/CMakePresets.json index 96c6253..6db75d0 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -122,43 +122,5 @@ "name": "ci-mingw", "inherits": [ "ci-build", "ci-win-mingw", "dev-mode", "vcpkg" ] } - ], - "buildPresets": [ - { - "name": "ci-ubuntu", - "configurePreset": "ci-ubuntu" - }, - { - "name": "ci-macOS", - "configurePreset": "ci-macOS" - }, - { - "name": "ci-windows", - "configurePreset": "ci-windows" - } - ], - "testPresets": [ - { - "name": "test-env", - "hidden": true, - "environment": { - "TLSUV_TEST_LOG": "7" - } - }, - { - "name": "ci-ubuntu", - "configurePreset": "ci-ubuntu", - "inherits": [ "test-env" ] - }, - { - "name": "ci-macOS", - "configurePreset": "ci-macOS", - "inherits": [ "test-env" ] - }, - { - "name": "ci-windows", - "configurePreset": "ci-windows", - "inherits": [ "test-env" ] - } ] }