From 6d3ded2b8427c08ef8e23a462b0e0d53a44622e4 Mon Sep 17 00:00:00 2001 From: Aleksey Loginov Date: Thu, 28 Nov 2024 22:26:37 +0300 Subject: [PATCH 01/17] Use macos-latest --- .github/workflows/ci v2.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci v2.yml b/.github/workflows/ci v2.yml index d952d1518..0342cbe40 100644 --- a/.github/workflows/ci v2.yml +++ b/.github/workflows/ci v2.yml @@ -24,7 +24,7 @@ jobs: config: [{name: ci-ubuntu-gcc, os: ubuntu-latest}, {name: ci-ubuntu-clang, os: ubuntu-latest}, {name: ci-windows, os: windows-latest}, - {name: ci-macos, os: macos-12}] + {name: ci-macos, os: macos-latest}] build_type: [{config: Release}, {config: Debug}] timeout-minutes: 120 @@ -137,7 +137,7 @@ jobs: config: [{name: ci-ubuntu-gcc, os: ubuntu-latest}, {name: ci-ubuntu-clang, os: ubuntu-latest}, {name: ci-windows, os: windows-latest}, - {name: ci-macos, os: macos-12}] + {name: ci-macos, os: macos-latest}] type: [tests, benchmarks] build_type: [{config: Release, test_preset: ci-tests}, {config: Debug, test_preset: ci-tests-debug}] optimization_disabled: [{mode: 0, postfix: ""}, {mode: 1, postfix: " (Optimizations disabled)"}] From 90b1bdc68ab089791c19ddfd80f45e30abde55f5 Mon Sep 17 00:00:00 2001 From: Aleksey Loginov Date: Thu, 28 Nov 2024 23:04:23 +0300 Subject: [PATCH 02/17] Update ci v2.yml --- .github/workflows/ci v2.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci v2.yml b/.github/workflows/ci v2.yml index 0342cbe40..2a7d489d3 100644 --- a/.github/workflows/ci v2.yml +++ b/.github/workflows/ci v2.yml @@ -55,18 +55,18 @@ jobs: lookup-only: true - name: Install Qt - if: steps.check_cache.outputs.cache-hit != 'true' || github.event_name == 'schedule' + # if: steps.check_cache.outputs.cache-hit != 'true' || github.event_name == 'schedule' uses: jurplel/install-qt-action@v4 with: cache: true - name: conan detect profile - if: steps.check_cache.outputs.cache-hit != 'true' || github.event_name == 'schedule' + # if: steps.check_cache.outputs.cache-hit != 'true' || github.event_name == 'schedule' run: | conan profile detect --force - name: Run CMake - if: steps.check_cache.outputs.cache-hit != 'true' || github.event_name == 'schedule' + # if: steps.check_cache.outputs.cache-hit != 'true' || github.event_name == 'schedule' uses: lukka/run-cmake@v10 with: configurePreset: ${{ matrix.config.name }}-tests From b7dea5a4257fedcf6dd3303660d00ddf12cb73c0 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Thu, 28 Nov 2024 20:04:30 +0000 Subject: [PATCH 03/17] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- .github/workflows/ci v2.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci v2.yml b/.github/workflows/ci v2.yml index 2a7d489d3..79d60d919 100644 --- a/.github/workflows/ci v2.yml +++ b/.github/workflows/ci v2.yml @@ -55,7 +55,7 @@ jobs: lookup-only: true - name: Install Qt - # if: steps.check_cache.outputs.cache-hit != 'true' || github.event_name == 'schedule' + # if: steps.check_cache.outputs.cache-hit != 'true' || github.event_name == 'schedule' uses: jurplel/install-qt-action@v4 with: cache: true From b48f8f29b944a7ff63853ef9955398a894628361 Mon Sep 17 00:00:00 2001 From: Aleksey Loginov Date: Fri, 29 Nov 2024 00:14:00 +0300 Subject: [PATCH 04/17] change caching --- .github/workflows/analyzers.yml | 8 +++----- .github/workflows/ci v2.yml | 11 +++++------ 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/.github/workflows/analyzers.yml b/.github/workflows/analyzers.yml index b75298cf1..904a8444a 100644 --- a/.github/workflows/analyzers.yml +++ b/.github/workflows/analyzers.yml @@ -7,7 +7,6 @@ on: types: - completed - jobs: pvs: if: github.repository_owner == 'victimsnino' && github.event.workflow_run.conclusion == 'success' @@ -39,8 +38,7 @@ jobs: path: | ~/.conan2 /Users/runner/.conan2/ - key: deps-ci-ubuntu-clang-Release-${{ hashFiles('**/conanfile.py') }}-${{ hashFiles('**/CMakePresets.json') }} - restore-keys: deps-ci-ubuntu-clang-Release + restore-keys: deps-ci-ubuntu-clang-Release-${{ hashFiles('**/conanfile.py') }}-${{ hashFiles('**/CMakePresets.json') }} - name: conan detect profile run: | @@ -112,8 +110,8 @@ jobs: path: | ~/.conan2 /Users/runner/.conan2/ - key: deps-ci-ubuntu-clang-Release-${{ hashFiles('**/conanfile.py') }}-${{ hashFiles('**/CMakePresets.json') }} - restore-keys: deps-ci-ubuntu-clang-Release + restore-keys: | + deps-ci-ubuntu-clang-Release-${{ hashFiles('**/conanfile.py') }}-${{ hashFiles('**/CMakePresets.json') }} - name: conan detect profile run: | diff --git a/.github/workflows/ci v2.yml b/.github/workflows/ci v2.yml index 79d60d919..d4c6e73f3 100644 --- a/.github/workflows/ci v2.yml +++ b/.github/workflows/ci v2.yml @@ -16,6 +16,8 @@ concurrency: group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} cancel-in-progress: true +env: + CACHE_INDEX: 1 jobs: cache_deps: @@ -50,8 +52,7 @@ jobs: path: | ~/.conan2 /Users/runner/.conan2/ - key: deps-${{ matrix.config.name }}-${{ matrix.build_type.config }}-${{ hashFiles('**/conanfile.py') }}-${{ hashFiles('**/CMakePresets.json') }} - restore-keys: deps-${{ matrix.config.name }}-${{ matrix.build_type.config }} + key: deps-${{ matrix.config.name }}-${{ matrix.build_type.config }}-${{ hashFiles('**/conanfile.py') }}-${{ hashFiles('**/CMakePresets.json') }}-${{CACHE_INDEX}} lookup-only: true - name: Install Qt @@ -110,8 +111,7 @@ jobs: path: | ~/.conan2 /Users/runner/.conan2/ - key: deps-ci-ubuntu-clang-Release-${{ hashFiles('**/conanfile.py') }}-${{ hashFiles('**/CMakePresets.json') }} - restore-keys: deps-ci-ubuntu-clang-Release + restore-keys: deps-ci-ubuntu-clang-Release-${{ hashFiles('**/conanfile.py') }}-${{ hashFiles('**/CMakePresets.json') }} - name: conan detect profile run: | @@ -188,8 +188,7 @@ jobs: path: | ~/.conan2 /Users/runner/.conan2/ - key: deps-${{ matrix.config.name }}-${{ matrix.build_type.config }}-${{ hashFiles('**/conanfile.py') }}-${{ hashFiles('**/CMakePresets.json') }} - restore-keys: deps-${{ matrix.config.name }}-${{ matrix.build_type.config }} + restore-keys: deps-${{ matrix.config.name }}-${{ matrix.build_type.config }}-${{ hashFiles('**/conanfile.py') }}-${{ hashFiles('**/CMakePresets.json') }} - name: conan detect profile run: | From 5dffe947d87cda28c2c6e7cbc4aaa2f016f09064 Mon Sep 17 00:00:00 2001 From: Aleksey Loginov Date: Fri, 29 Nov 2024 00:14:12 +0300 Subject: [PATCH 05/17] uncomment --- .github/workflows/ci v2.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci v2.yml b/.github/workflows/ci v2.yml index d4c6e73f3..0666ef96f 100644 --- a/.github/workflows/ci v2.yml +++ b/.github/workflows/ci v2.yml @@ -56,18 +56,18 @@ jobs: lookup-only: true - name: Install Qt - # if: steps.check_cache.outputs.cache-hit != 'true' || github.event_name == 'schedule' + if: steps.check_cache.outputs.cache-hit != 'true' || github.event_name == 'schedule' uses: jurplel/install-qt-action@v4 with: cache: true - name: conan detect profile - # if: steps.check_cache.outputs.cache-hit != 'true' || github.event_name == 'schedule' + if: steps.check_cache.outputs.cache-hit != 'true' || github.event_name == 'schedule' run: | conan profile detect --force - name: Run CMake - # if: steps.check_cache.outputs.cache-hit != 'true' || github.event_name == 'schedule' + if: steps.check_cache.outputs.cache-hit != 'true' || github.event_name == 'schedule' uses: lukka/run-cmake@v10 with: configurePreset: ${{ matrix.config.name }}-tests From 948a6335f2dec8e063c2ee05dff53e6497c79666 Mon Sep 17 00:00:00 2001 From: Aleksey Loginov Date: Sat, 30 Nov 2024 23:45:46 +0300 Subject: [PATCH 06/17] Update ci v2.yml --- .github/workflows/ci v2.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci v2.yml b/.github/workflows/ci v2.yml index 0666ef96f..0d3ddcd2a 100644 --- a/.github/workflows/ci v2.yml +++ b/.github/workflows/ci v2.yml @@ -52,7 +52,7 @@ jobs: path: | ~/.conan2 /Users/runner/.conan2/ - key: deps-${{ matrix.config.name }}-${{ matrix.build_type.config }}-${{ hashFiles('**/conanfile.py') }}-${{ hashFiles('**/CMakePresets.json') }}-${{CACHE_INDEX}} + key: deps-${{ matrix.config.name }}-${{ matrix.build_type.config }}-${{ hashFiles('**/conanfile.py') }}-${{ hashFiles('**/CMakePresets.json') }}-${{env.CACHE_INDEX}} lookup-only: true - name: Install Qt From 32fd6a91626c50dd0f19c24b7096e4aaed25fd91 Mon Sep 17 00:00:00 2001 From: Aleksey Loginov Date: Mon, 2 Dec 2024 10:47:18 +0300 Subject: [PATCH 07/17] fix --- .github/workflows/analyzers.yml | 8 +++++--- .github/workflows/ci v2.yml | 4 ++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/analyzers.yml b/.github/workflows/analyzers.yml index 904a8444a..91b762ef3 100644 --- a/.github/workflows/analyzers.yml +++ b/.github/workflows/analyzers.yml @@ -7,6 +7,9 @@ on: types: - completed +env: + CACHE_INDEX: 1 + jobs: pvs: if: github.repository_owner == 'victimsnino' && github.event.workflow_run.conclusion == 'success' @@ -38,7 +41,7 @@ jobs: path: | ~/.conan2 /Users/runner/.conan2/ - restore-keys: deps-ci-ubuntu-clang-Release-${{ hashFiles('**/conanfile.py') }}-${{ hashFiles('**/CMakePresets.json') }} + key: deps-ci-ubuntu-clang-Release-${{ hashFiles('**/conanfile.py') }}-${{ hashFiles('**/CMakePresets.json') }}-${{env.CACHE_INDEX}} - name: conan detect profile run: | @@ -110,8 +113,7 @@ jobs: path: | ~/.conan2 /Users/runner/.conan2/ - restore-keys: | - deps-ci-ubuntu-clang-Release-${{ hashFiles('**/conanfile.py') }}-${{ hashFiles('**/CMakePresets.json') }} + key: deps-ci-ubuntu-clang-Release-${{ hashFiles('**/conanfile.py') }}-${{ hashFiles('**/CMakePresets.json') }}-${{env.CACHE_INDEX}} - name: conan detect profile run: | diff --git a/.github/workflows/ci v2.yml b/.github/workflows/ci v2.yml index 0d3ddcd2a..bf59cc526 100644 --- a/.github/workflows/ci v2.yml +++ b/.github/workflows/ci v2.yml @@ -111,7 +111,7 @@ jobs: path: | ~/.conan2 /Users/runner/.conan2/ - restore-keys: deps-ci-ubuntu-clang-Release-${{ hashFiles('**/conanfile.py') }}-${{ hashFiles('**/CMakePresets.json') }} + key: deps-ci-ubuntu-clang-Release-${{ hashFiles('**/conanfile.py') }}-${{ hashFiles('**/CMakePresets.json') }}-${{env.CACHE_INDEX}} - name: conan detect profile run: | @@ -188,7 +188,7 @@ jobs: path: | ~/.conan2 /Users/runner/.conan2/ - restore-keys: deps-${{ matrix.config.name }}-${{ matrix.build_type.config }}-${{ hashFiles('**/conanfile.py') }}-${{ hashFiles('**/CMakePresets.json') }} + key: deps-${{ matrix.config.name }}-${{ matrix.build_type.config }}-${{ hashFiles('**/conanfile.py') }}-${{ hashFiles('**/CMakePresets.json') }}-${{env.CACHE_INDEX}} - name: conan detect profile run: | From a1eaa00442efe200cc7b08dde23686fda24323f9 Mon Sep 17 00:00:00 2001 From: Aleksey Loginov Date: Mon, 2 Dec 2024 12:40:09 +0300 Subject: [PATCH 08/17] fix --- .github/workflows/analyzers.yml | 2 ++ .github/workflows/ci v2.yml | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/.github/workflows/analyzers.yml b/.github/workflows/analyzers.yml index 91b762ef3..2401cc730 100644 --- a/.github/workflows/analyzers.yml +++ b/.github/workflows/analyzers.yml @@ -31,6 +31,7 @@ jobs: uses: jurplel/install-qt-action@v4 with: cache: true + cache-key-prefix: ${{env.CACHE_INDEX}} - name: get conan uses: turtlebrowser/get-conan@main @@ -103,6 +104,7 @@ jobs: uses: jurplel/install-qt-action@v4 with: cache: true + cache-key-prefix: ${{env.CACHE_INDEX}} - name: get conan uses: turtlebrowser/get-conan@main diff --git a/.github/workflows/ci v2.yml b/.github/workflows/ci v2.yml index bf59cc526..48d933b88 100644 --- a/.github/workflows/ci v2.yml +++ b/.github/workflows/ci v2.yml @@ -60,6 +60,7 @@ jobs: uses: jurplel/install-qt-action@v4 with: cache: true + cache-key-prefix: ${{env.CACHE_INDEX}} - name: conan detect profile if: steps.check_cache.outputs.cache-hit != 'true' || github.event_name == 'schedule' @@ -101,6 +102,7 @@ jobs: uses: jurplel/install-qt-action@v4 with: cache: true + cache-key-prefix: ${{env.CACHE_INDEX}} - name: get conan uses: turtlebrowser/get-conan@main @@ -178,6 +180,7 @@ jobs: uses: jurplel/install-qt-action@v4 with: cache: true + cache-key-prefix: ${{env.CACHE_INDEX}} - name: get conan uses: turtlebrowser/get-conan@main @@ -257,6 +260,7 @@ jobs: uses: jurplel/install-qt-action@v4 with: cache: true + cache-key-prefix: ${{env.CACHE_INDEX}} - name: Install project and build env: From 5d03d0bfc161f286f74ea68cf5bd5b20c19360df Mon Sep 17 00:00:00 2001 From: Aleksey Loginov Date: Mon, 2 Dec 2024 15:50:29 +0300 Subject: [PATCH 09/17] fix --- .github/workflows/analyzers.yml | 2 +- .github/workflows/ci v2.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/analyzers.yml b/.github/workflows/analyzers.yml index 2401cc730..75f17fa7f 100644 --- a/.github/workflows/analyzers.yml +++ b/.github/workflows/analyzers.yml @@ -8,7 +8,7 @@ on: - completed env: - CACHE_INDEX: 1 + CACHE_INDEX: '2' jobs: pvs: diff --git a/.github/workflows/ci v2.yml b/.github/workflows/ci v2.yml index 48d933b88..49e1241e1 100644 --- a/.github/workflows/ci v2.yml +++ b/.github/workflows/ci v2.yml @@ -17,7 +17,7 @@ concurrency: cancel-in-progress: true env: - CACHE_INDEX: 1 + CACHE_INDEX: '2' jobs: cache_deps: From d8625703a8d33b6a121a40fe15c7a106ccfb4dea Mon Sep 17 00:00:00 2001 From: Aleksey Loginov Date: Mon, 2 Dec 2024 18:22:14 +0300 Subject: [PATCH 10/17] try use qt via conan --- .github/workflows/analyzers.yml | 12 ------------ .github/workflows/ci v2.yml | 25 ------------------------- cmake/variables.cmake | 3 +++ conanfile.py | 10 ++++++++-- 4 files changed, 11 insertions(+), 39 deletions(-) diff --git a/.github/workflows/analyzers.yml b/.github/workflows/analyzers.yml index 75f17fa7f..e8161e0ec 100644 --- a/.github/workflows/analyzers.yml +++ b/.github/workflows/analyzers.yml @@ -27,12 +27,6 @@ jobs: repository: ${{ github.event.workflow_run.head_repository.full_name }} ref: ${{ github.event.workflow_run.head_branch }} - - name: Install Qt - uses: jurplel/install-qt-action@v4 - with: - cache: true - cache-key-prefix: ${{env.CACHE_INDEX}} - - name: get conan uses: turtlebrowser/get-conan@main @@ -100,12 +94,6 @@ jobs: - name: Install llvm run: sudo apt-get update -q && sudo apt-get install llvm -q -y - - name: Install Qt - uses: jurplel/install-qt-action@v4 - with: - cache: true - cache-key-prefix: ${{env.CACHE_INDEX}} - - name: get conan uses: turtlebrowser/get-conan@main diff --git a/.github/workflows/ci v2.yml b/.github/workflows/ci v2.yml index 49e1241e1..8a1a77f30 100644 --- a/.github/workflows/ci v2.yml +++ b/.github/workflows/ci v2.yml @@ -55,13 +55,6 @@ jobs: key: deps-${{ matrix.config.name }}-${{ matrix.build_type.config }}-${{ hashFiles('**/conanfile.py') }}-${{ hashFiles('**/CMakePresets.json') }}-${{env.CACHE_INDEX}} lookup-only: true - - name: Install Qt - if: steps.check_cache.outputs.cache-hit != 'true' || github.event_name == 'schedule' - uses: jurplel/install-qt-action@v4 - with: - cache: true - cache-key-prefix: ${{env.CACHE_INDEX}} - - name: conan detect profile if: steps.check_cache.outputs.cache-hit != 'true' || github.event_name == 'schedule' run: | @@ -98,12 +91,6 @@ jobs: # sudo apt-get purge -y g++-13 gcc-13 libstdc++-13-dev # sudo apt-get install -y --allow-downgrades libstdc++-12-dev libstdc++6=12.* libgcc-s1=12.* - - name: Install Qt - uses: jurplel/install-qt-action@v4 - with: - cache: true - cache-key-prefix: ${{env.CACHE_INDEX}} - - name: get conan uses: turtlebrowser/get-conan@main @@ -176,12 +163,6 @@ jobs: - name: Cmake version run: cmake --version - - name: Install Qt - uses: jurplel/install-qt-action@v4 - with: - cache: true - cache-key-prefix: ${{env.CACHE_INDEX}} - - name: get conan uses: turtlebrowser/get-conan@main @@ -256,12 +237,6 @@ jobs: with: fetch-depth: 0 - - name: Install Qt - uses: jurplel/install-qt-action@v4 - with: - cache: true - cache-key-prefix: ${{env.CACHE_INDEX}} - - name: Install project and build env: CC: gcc-10 diff --git a/cmake/variables.cmake b/cmake/variables.cmake index 297a9933d..b6fd4708a 100644 --- a/cmake/variables.cmake +++ b/cmake/variables.cmake @@ -108,6 +108,9 @@ if (RPP_DEVELOPER_MODE) if (RPP_BUILD_ASIO_CODE) set(CONAN_ARGS "${CONAN_ARGS};-o rpp/*:with_asio=True") endif() + if (RPP_BUILD_QT_CODE) + set(CONAN_ARGS "${CONAN_ARGS};-o rpp/*:with_qt=True") + endif() endif() if(RPP_ENABLE_COVERAGE) diff --git a/conanfile.py b/conanfile.py index f8fbc9a53..06756f67b 100644 --- a/conanfile.py +++ b/conanfile.py @@ -12,7 +12,8 @@ class RppConan(ConanFile): "with_tests" : [False, True], "with_cmake" : [False, True], "with_benchmarks" : [False, True], - "with_asio" : [False, True] + "with_asio" : [False, True], + "with_qt" : [False, True], } default_options = { "with_grpc" : False, @@ -20,7 +21,9 @@ class RppConan(ConanFile): "with_tests": False, "with_cmake": False, "with_benchmarks" : False, - "with_asio" : False + "with_asio" : False, + "with_qt" : False, + "qt:shared": True, } def requirements(self): @@ -44,3 +47,6 @@ def requirements(self): if self.options.with_cmake: self.tool_requires("cmake/3.29.3") + + if self.options.with_qt: + self.requires("qt/5.15.14", transitive_libs=True) From b03e270f976be58f2ac91feea1635a246a9dc2c3 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 2 Dec 2024 15:22:23 +0000 Subject: [PATCH 11/17] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conanfile.py b/conanfile.py index 06756f67b..55a369440 100644 --- a/conanfile.py +++ b/conanfile.py @@ -47,6 +47,6 @@ def requirements(self): if self.options.with_cmake: self.tool_requires("cmake/3.29.3") - + if self.options.with_qt: self.requires("qt/5.15.14", transitive_libs=True) From 42b789567f834a4d968e938f27475accd879143a Mon Sep 17 00:00:00 2001 From: Aleksey Loginov Date: Mon, 2 Dec 2024 18:25:47 +0300 Subject: [PATCH 12/17] fix --- conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conanfile.py b/conanfile.py index 55a369440..fa76c24fa 100644 --- a/conanfile.py +++ b/conanfile.py @@ -23,7 +23,7 @@ class RppConan(ConanFile): "with_benchmarks" : False, "with_asio" : False, "with_qt" : False, - "qt:shared": True, + "qt/*:shared": True, } def requirements(self): From 6fd4f358041adbfcf46d7c839300e94757871c13 Mon Sep 17 00:00:00 2001 From: Aleksey Loginov Date: Mon, 2 Dec 2024 23:04:41 +0300 Subject: [PATCH 13/17] fix components --- cmake/dependencies.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake index 469278cf2..2db51fcdd 100644 --- a/cmake/dependencies.cmake +++ b/cmake/dependencies.cmake @@ -48,12 +48,12 @@ endif() # ==================== QT ========================== if (RPP_BUILD_QT_CODE AND (RPP_BUILD_TESTS OR RPP_BUILD_EXAMPLES)) - find_package(Qt6 COMPONENTS Widgets QUIET) + find_package(Qt6 COMPONENTS Widgets Core Gui QUIET) if (Qt6_FOUND) SET(RPP_QT_TARGET Qt6) else() message("-- RPP: Can't find Qt6, searching for Qt5...") - find_package(Qt5 REQUIRED COMPONENTS Widgets) + find_package(Qt5 REQUIRED COMPONENTS Widgets Core Gui) SET(RPP_QT_TARGET Qt5) endif() From 7de75de913b06a1f595e67e943fff6517f67337a Mon Sep 17 00:00:00 2001 From: Aleksey Loginov Date: Tue, 3 Dec 2024 10:21:09 +0300 Subject: [PATCH 14/17] fix --- cmake/dependencies.cmake | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake index 2db51fcdd..fc148d510 100644 --- a/cmake/dependencies.cmake +++ b/cmake/dependencies.cmake @@ -61,11 +61,11 @@ if (RPP_BUILD_QT_CODE AND (RPP_BUILD_TESTS OR RPP_BUILD_EXAMPLES)) macro(rpp_add_qt_support_to_executable TARGET) target_link_libraries(${TARGET} PRIVATE ${RPP_QT_TARGET}::Widgets) set_target_properties(${TARGET} PROPERTIES AUTOMOC TRUE) - if (WIN32) - add_custom_command (TARGET ${TARGET} POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different $ $) - add_custom_command (TARGET ${TARGET} POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different $ $) - add_custom_command (TARGET ${TARGET} POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different $ $) - endif() + # if (WIN32) + # add_custom_command (TARGET ${TARGET} POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different $ $) + # add_custom_command (TARGET ${TARGET} POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different $ $) + # add_custom_command (TARGET ${TARGET} POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different $ $) + # endif() endmacro() endif() From 29108218fee0960508e1aa551da3eb337f349120 Mon Sep 17 00:00:00 2001 From: Aleksey Loginov Date: Tue, 3 Dec 2024 13:34:06 +0300 Subject: [PATCH 15/17] fix --- .github/workflows/analyzers.yml | 8 ++++++++ .github/workflows/ci v2.yml | 14 +++++++------- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/.github/workflows/analyzers.yml b/.github/workflows/analyzers.yml index e8161e0ec..e3394b200 100644 --- a/.github/workflows/analyzers.yml +++ b/.github/workflows/analyzers.yml @@ -27,6 +27,10 @@ jobs: repository: ${{ github.event.workflow_run.head_repository.full_name }} ref: ${{ github.event.workflow_run.head_branch }} + - uses: actions/setup-python@v5 + with: + python-version: '3.6.x - 3.11.x' + - name: get conan uses: turtlebrowser/get-conan@main @@ -94,6 +98,10 @@ jobs: - name: Install llvm run: sudo apt-get update -q && sudo apt-get install llvm -q -y + - uses: actions/setup-python@v5 + with: + python-version: '3.6.x - 3.11.x' + - name: get conan uses: turtlebrowser/get-conan@main diff --git a/.github/workflows/ci v2.yml b/.github/workflows/ci v2.yml index 8a1a77f30..cead71e52 100644 --- a/.github/workflows/ci v2.yml +++ b/.github/workflows/ci v2.yml @@ -83,13 +83,9 @@ jobs: with: fetch-depth: 0 - # Work around https://github.com/actions/runner-images/issues/8659 - # - name: "Remove GCC 13 from runner image (workaround)" - # shell: bash - # run: | - # sudo apt-get update - # sudo apt-get purge -y g++-13 gcc-13 libstdc++-13-dev - # sudo apt-get install -y --allow-downgrades libstdc++-12-dev libstdc++6=12.* libgcc-s1=12.* + - uses: actions/setup-python@v5 + with: + python-version: '3.6.x - 3.11.x' - name: get conan uses: turtlebrowser/get-conan@main @@ -162,6 +158,10 @@ jobs: - name: Cmake version run: cmake --version + + - uses: actions/setup-python@v5 + with: + python-version: '3.6.x - 3.11.x' - name: get conan uses: turtlebrowser/get-conan@main From b4a01e4cfaf19b8f1c261acad2e2bb56dde1ea0d Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 3 Dec 2024 10:34:14 +0000 Subject: [PATCH 16/17] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- .github/workflows/ci v2.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci v2.yml b/.github/workflows/ci v2.yml index cead71e52..da4aa299c 100644 --- a/.github/workflows/ci v2.yml +++ b/.github/workflows/ci v2.yml @@ -158,7 +158,7 @@ jobs: - name: Cmake version run: cmake --version - + - uses: actions/setup-python@v5 with: python-version: '3.6.x - 3.11.x' From 6b6ccbb0867320a5a120a11b815bf6e7e61c68da Mon Sep 17 00:00:00 2001 From: Aleksey Loginov Date: Tue, 3 Dec 2024 15:10:25 +0300 Subject: [PATCH 17/17] remove debug --- .github/workflows/ci v2.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci v2.yml b/.github/workflows/ci v2.yml index da4aa299c..7c28b34a6 100644 --- a/.github/workflows/ci v2.yml +++ b/.github/workflows/ci v2.yml @@ -27,7 +27,7 @@ jobs: {name: ci-ubuntu-clang, os: ubuntu-latest}, {name: ci-windows, os: windows-latest}, {name: ci-macos, os: macos-latest}] - build_type: [{config: Release}, {config: Debug}] + build_type: [{config: Release}] timeout-minutes: 120 runs-on: ${{ matrix.config.os }} @@ -124,7 +124,7 @@ jobs: {name: ci-windows, os: windows-latest}, {name: ci-macos, os: macos-latest}] type: [tests, benchmarks] - build_type: [{config: Release, test_preset: ci-tests}, {config: Debug, test_preset: ci-tests-debug}] + build_type: [{config: Release, test_preset: ci-tests}] optimization_disabled: [{mode: 0, postfix: ""}, {mode: 1, postfix: " (Optimizations disabled)"}] timeout-minutes: 20