From 1f7ce0413aaec0c50d895006f4ae854620e3aa8c Mon Sep 17 00:00:00 2001 From: Aleksey Loginov Date: Thu, 4 Sep 2025 22:48:43 +0300 Subject: [PATCH 01/31] jinja2 --- .github/workflows/ci v2.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/ci v2.yml b/.github/workflows/ci v2.yml index 6c501fe50..04ae789be 100644 --- a/.github/workflows/ci v2.yml +++ b/.github/workflows/ci v2.yml @@ -40,6 +40,11 @@ jobs: with: python-version: '3.6.x - 3.11.x' + - name: Install jinja2 + if: matrix.config.os == 'ubuntu-22.04' + run: | + sudo apt-get update -q && sudo apt-get install python-jinja2 -y -q + - name: get conan uses: turtlebrowser/get-conan@main From b160606e710f51bc13dc3a1d37dbad632c72350d Mon Sep 17 00:00:00 2001 From: Aleksey Loginov Date: Thu, 4 Sep 2025 22:50:23 +0300 Subject: [PATCH 02/31] 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 04ae789be..5746d7e99 100644 --- a/.github/workflows/ci v2.yml +++ b/.github/workflows/ci v2.yml @@ -43,7 +43,7 @@ jobs: - name: Install jinja2 if: matrix.config.os == 'ubuntu-22.04' run: | - sudo apt-get update -q && sudo apt-get install python-jinja2 -y -q + sudo apt-get update -q && sudo apt-get install python3-jinja2 -y -q - name: get conan uses: turtlebrowser/get-conan@main From f1f5f463a760cda7a919fd0ac0a90d1f957b1211 Mon Sep 17 00:00:00 2001 From: Aleksey Loginov Date: Thu, 4 Sep 2025 23:05:55 +0300 Subject: [PATCH 03/31] 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 5746d7e99..ef1d3e32f 100644 --- a/.github/workflows/ci v2.yml +++ b/.github/workflows/ci v2.yml @@ -43,7 +43,7 @@ jobs: - name: Install jinja2 if: matrix.config.os == 'ubuntu-22.04' run: | - sudo apt-get update -q && sudo apt-get install python3-jinja2 -y -q + sudo apt-get update -q && sudo apt-get install python3-yaml python3-ply python3-jinja2 -y -q - name: get conan uses: turtlebrowser/get-conan@main From 4a8849f770061a8d2073b741b4da20a2c41836e8 Mon Sep 17 00:00:00 2001 From: Aleksey Loginov Date: Thu, 4 Sep 2025 23:32:07 +0300 Subject: [PATCH 04/31] Update ci v2.yml --- .github/workflows/ci v2.yml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/.github/workflows/ci v2.yml b/.github/workflows/ci v2.yml index ef1d3e32f..86c4eb020 100644 --- a/.github/workflows/ci v2.yml +++ b/.github/workflows/ci v2.yml @@ -37,13 +37,7 @@ jobs: fetch-depth: 0 - uses: actions/setup-python@v5 - with: - python-version: '3.6.x - 3.11.x' - - - name: Install jinja2 - if: matrix.config.os == 'ubuntu-22.04' - run: | - sudo apt-get update -q && sudo apt-get install python3-yaml python3-ply python3-jinja2 -y -q + with: { python-version: "3.8" } - name: get conan uses: turtlebrowser/get-conan@main From 1d72546e92e8164509c3ecfcd667629389ac8d68 Mon Sep 17 00:00:00 2001 From: Aleksey Loginov Date: Fri, 5 Sep 2025 00:05:50 +0300 Subject: [PATCH 05/31] Update ci v2.yml --- .github/workflows/ci v2.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/ci v2.yml b/.github/workflows/ci v2.yml index 86c4eb020..6617c50df 100644 --- a/.github/workflows/ci v2.yml +++ b/.github/workflows/ci v2.yml @@ -38,6 +38,12 @@ jobs: - uses: actions/setup-python@v5 with: { python-version: "3.8" } + + - name: Install deps + if: matrix.config.os == 'ubuntu-22.04' + run: | + sudo apt-get update -q + pip install pyyaml jinja2 - name: get conan uses: turtlebrowser/get-conan@main From 097f3b91d5df702a27ecef1ab07661c11ac5f100 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Thu, 4 Sep 2025 21:06:28 +0000 Subject: [PATCH 06/31] [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 6617c50df..ad69fba64 100644 --- a/.github/workflows/ci v2.yml +++ b/.github/workflows/ci v2.yml @@ -38,7 +38,7 @@ jobs: - uses: actions/setup-python@v5 with: { python-version: "3.8" } - + - name: Install deps if: matrix.config.os == 'ubuntu-22.04' run: | From 960d5b1aebb855266b436c0266a65c026d039e97 Mon Sep 17 00:00:00 2001 From: Aleksey Loginov Date: Fri, 5 Sep 2025 09:16:02 +0300 Subject: [PATCH 07/31] 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 ad69fba64..1128089db 100644 --- a/.github/workflows/ci v2.yml +++ b/.github/workflows/ci v2.yml @@ -39,15 +39,15 @@ jobs: - uses: actions/setup-python@v5 with: { python-version: "3.8" } + - name: get conan + uses: turtlebrowser/get-conan@main + - name: Install deps if: matrix.config.os == 'ubuntu-22.04' run: | sudo apt-get update -q pip install pyyaml jinja2 - - name: get conan - uses: turtlebrowser/get-conan@main - - name: check cache uses: actions/cache@v4 id: check_cache From 71da089c926bc9eb6c105bc1f58d0c5745178106 Mon Sep 17 00:00:00 2001 From: Aleksey Loginov Date: Fri, 5 Sep 2025 09:40:31 +0300 Subject: [PATCH 08/31] Update ci v2.yml --- .github/workflows/ci v2.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci v2.yml b/.github/workflows/ci v2.yml index 1128089db..e85968289 100644 --- a/.github/workflows/ci v2.yml +++ b/.github/workflows/ci v2.yml @@ -47,6 +47,8 @@ jobs: run: | sudo apt-get update -q pip install pyyaml jinja2 + sudo apt install python3-jinja2 + sudo pacman -S python-jinja - name: check cache uses: actions/cache@v4 From 2273c54c2ab5f35cdd8a39ed4ddc7f0995b4fec7 Mon Sep 17 00:00:00 2001 From: Aleksey Loginov Date: Fri, 5 Sep 2025 09:40:52 +0300 Subject: [PATCH 09/31] 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 e85968289..f689b1ca1 100644 --- a/.github/workflows/ci v2.yml +++ b/.github/workflows/ci v2.yml @@ -47,7 +47,7 @@ jobs: run: | sudo apt-get update -q pip install pyyaml jinja2 - sudo apt install python3-jinja2 + sudo apt-get install python3-jinja2 sudo pacman -S python-jinja - name: check cache From af82c9aa5767ce983ff397c54655b3ec96b93e5b Mon Sep 17 00:00:00 2001 From: Aleksey Loginov Date: Fri, 5 Sep 2025 09:42:30 +0300 Subject: [PATCH 10/31] Update ci v2.yml --- .github/workflows/ci v2.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/ci v2.yml b/.github/workflows/ci v2.yml index f689b1ca1..a5132fd00 100644 --- a/.github/workflows/ci v2.yml +++ b/.github/workflows/ci v2.yml @@ -46,9 +46,8 @@ jobs: if: matrix.config.os == 'ubuntu-22.04' run: | sudo apt-get update -q - pip install pyyaml jinja2 + pip3 install pyyaml jinja2 sudo apt-get install python3-jinja2 - sudo pacman -S python-jinja - name: check cache uses: actions/cache@v4 From 5833f8b23c212e4dd23995609543414b7dc30bb4 Mon Sep 17 00:00:00 2001 From: Aleksey Loginov Date: Fri, 5 Sep 2025 09:56:09 +0300 Subject: [PATCH 11/31] 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 a5132fd00..0c5a2ba90 100644 --- a/.github/workflows/ci v2.yml +++ b/.github/workflows/ci v2.yml @@ -47,7 +47,7 @@ jobs: run: | sudo apt-get update -q pip3 install pyyaml jinja2 - sudo apt-get install python3-jinja2 + sudo apt-get install libsystemd-dev python3-jinja2 - name: check cache uses: actions/cache@v4 From ac42aa64fb75c21343d86982829cc505b4b31ef9 Mon Sep 17 00:00:00 2001 From: Aleksey Loginov Date: Fri, 5 Sep 2025 12:24:27 +0300 Subject: [PATCH 12/31] Update ci v2.yml --- .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 0c5a2ba90..e102b4052 100644 --- a/.github/workflows/ci v2.yml +++ b/.github/workflows/ci v2.yml @@ -21,8 +21,8 @@ jobs: cache_deps: strategy: matrix: - config: [{name: ci-ubuntu-gcc, os: ubuntu-22.04}, - {name: ci-ubuntu-clang, os: ubuntu-22.04}, + 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-latest}] build_type: [{config: Release}, {config: Debug}] From b13606cba3647aa5510c4ccb8ad98d829787bf2a Mon Sep 17 00:00:00 2001 From: Aleksey Loginov Date: Fri, 5 Sep 2025 15:37:19 +0300 Subject: [PATCH 13/31] Update conanfile.py --- conanfile.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/conanfile.py b/conanfile.py index f8fbc9a53..c75a8eb08 100644 --- a/conanfile.py +++ b/conanfile.py @@ -23,6 +23,19 @@ class RppConan(ConanFile): "with_asio" : False } + def configure(self): + self.options["grpc/*"].codegen = False + self.options["grpc/*"].cpp_plugin = True + self.options["grpc/*"].csharp_ext = False + self.options["grpc/*"].php_plugin = False + self.options["grpc/*"].node_plugin = False + self.options["grpc/*"].otel_plugin = False + self.options["grpc/*"].ruby_plugin = False + self.options["grpc/*"].csharp_plugin = False + self.options["grpc/*"].python_plugin = False + self.options["grpc/*"].with_libsystemd = False + self.options["grpc/*"].objective_c_plugin = False + def requirements(self): if self.options.with_tests: self.requires("trompeloeil/48") From b47766819c9e7ef8c16d7f2d413fbc2b9e76b7a6 Mon Sep 17 00:00:00 2001 From: Aleksey Loginov Date: Fri, 5 Sep 2025 15:39:52 +0300 Subject: [PATCH 14/31] Update ci v2.yml --- .github/workflows/ci v2.yml | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci v2.yml b/.github/workflows/ci v2.yml index e102b4052..86c4eb020 100644 --- a/.github/workflows/ci v2.yml +++ b/.github/workflows/ci v2.yml @@ -21,8 +21,8 @@ jobs: cache_deps: strategy: matrix: - config: [{name: ci-ubuntu-gcc, os: ubuntu-latest}, - {name: ci-ubuntu-clang, os: ubuntu-latest}, + config: [{name: ci-ubuntu-gcc, os: ubuntu-22.04}, + {name: ci-ubuntu-clang, os: ubuntu-22.04}, {name: ci-windows, os: windows-latest}, {name: ci-macos, os: macos-latest}] build_type: [{config: Release}, {config: Debug}] @@ -42,13 +42,6 @@ jobs: - name: get conan uses: turtlebrowser/get-conan@main - - name: Install deps - if: matrix.config.os == 'ubuntu-22.04' - run: | - sudo apt-get update -q - pip3 install pyyaml jinja2 - sudo apt-get install libsystemd-dev python3-jinja2 - - name: check cache uses: actions/cache@v4 id: check_cache From 394508defe4d0148cba9bcea3808df5432a6e254 Mon Sep 17 00:00:00 2001 From: Aleksey Loginov Date: Fri, 5 Sep 2025 15:49:20 +0300 Subject: [PATCH 15/31] Update conanfile.py --- conanfile.py | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/conanfile.py b/conanfile.py index c75a8eb08..f2ba1bd6f 100644 --- a/conanfile.py +++ b/conanfile.py @@ -24,17 +24,7 @@ class RppConan(ConanFile): } def configure(self): - self.options["grpc/*"].codegen = False - self.options["grpc/*"].cpp_plugin = True - self.options["grpc/*"].csharp_ext = False - self.options["grpc/*"].php_plugin = False - self.options["grpc/*"].node_plugin = False - self.options["grpc/*"].otel_plugin = False - self.options["grpc/*"].ruby_plugin = False - self.options["grpc/*"].csharp_plugin = False - self.options["grpc/*"].python_plugin = False self.options["grpc/*"].with_libsystemd = False - self.options["grpc/*"].objective_c_plugin = False def requirements(self): if self.options.with_tests: From c063a959ab65117d889d70cf2cb0bd29ee2979c2 Mon Sep 17 00:00:00 2001 From: Aleksey Loginov Date: Fri, 5 Sep 2025 15:53:59 +0300 Subject: [PATCH 16/31] Update conanfile.py --- conanfile.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/conanfile.py b/conanfile.py index f2ba1bd6f..c7927b4dd 100644 --- a/conanfile.py +++ b/conanfile.py @@ -25,6 +25,12 @@ class RppConan(ConanFile): def configure(self): self.options["grpc/*"].with_libsystemd = False + self.options["grpc/*"].csharp_plugin = False + self.options["grpc/*"].node_plugin = False + self.options["grpc/*"].objective_c_plugin = False + self.options["grpc/*"].php_plugin = False + self.options["grpc/*"].python_plugin = False + self.options["grpc/*"].ruby_plugin = False def requirements(self): if self.options.with_tests: From aa660737aadbede6fa92aff95c01cf8c28559894 Mon Sep 17 00:00:00 2001 From: Aleksey Loginov Date: Fri, 5 Sep 2025 16:24:19 +0300 Subject: [PATCH 17/31] Update CMakePresets.json --- CMakePresets.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakePresets.json b/CMakePresets.json index 244068c2d..6200029db 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -38,7 +38,7 @@ "inherits" : ["ci-flags"], "hidden": true, "cacheVariables": { - "CMAKE_CXX_FLAGS": "-fno-rtti -Wall -Werror -Wextra -Wpedantic -Wcast-qual -Wformat=2 -Wundef -Werror=float-equal -Wno-gnu-zero-variadic-macro-arguments -Wno-error=maybe-uninitialized -Wno-error=uninitialized -Wno-unknown-warning-option" + "CMAKE_CXX_FLAGS": "-fno-rtti -Wall -Werror -Wextra -Wpedantic -Wcast-qual -Wformat=2 -Wundef -Werror=float-equal -Wno-gnu-zero-variadic-macro-arguments -Wno-error=maybe-uninitialized -Wno-error=uninitialized -Wno-unknown-warning-option -Wno-missing-template-arg-list-after-template-kw" } }, { From 260b921b5a08f52288266b263b0e16fab9e935e9 Mon Sep 17 00:00:00 2001 From: Aleksey Loginov Date: Fri, 5 Sep 2025 16:43:44 +0300 Subject: [PATCH 18/31] Update conanfile.py --- conanfile.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conanfile.py b/conanfile.py index c7927b4dd..660bf35d4 100644 --- a/conanfile.py +++ b/conanfile.py @@ -44,8 +44,8 @@ def requirements(self): self.requires("sfml/2.6.1", options={"audio": False}) if self.options.with_grpc: - self.requires("grpc/1.54.3", transitive_libs=True, transitive_headers=True) - self.requires("protobuf/3.21.12") + self.requires("grpc/1.72.0", transitive_libs=True, transitive_headers=True) + self.requires("protobuf/6.30.1") self.requires("libmount/2.39", override=True) if self.options.with_asio: From 939f91fb615cae2bfaa8a72301a6460223d4df23 Mon Sep 17 00:00:00 2001 From: Aleksey Loginov Date: Fri, 5 Sep 2025 16:46:16 +0300 Subject: [PATCH 19/31] Update conanfile.py --- conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conanfile.py b/conanfile.py index 660bf35d4..0e9976a59 100644 --- a/conanfile.py +++ b/conanfile.py @@ -45,7 +45,7 @@ def requirements(self): if self.options.with_grpc: self.requires("grpc/1.72.0", transitive_libs=True, transitive_headers=True) - self.requires("protobuf/6.30.1") + self.requires("protobuf/5.27.0") self.requires("libmount/2.39", override=True) if self.options.with_asio: From 6ced3b45a1b2145f83fb4e0ec0fdc29bd5c77fe6 Mon Sep 17 00:00:00 2001 From: Aleksey Loginov Date: Fri, 5 Sep 2025 16:57:04 +0300 Subject: [PATCH 20/31] Update conanfile.py --- conanfile.py | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/conanfile.py b/conanfile.py index 0e9976a59..43309838d 100644 --- a/conanfile.py +++ b/conanfile.py @@ -44,8 +44,8 @@ def requirements(self): self.requires("sfml/2.6.1", options={"audio": False}) if self.options.with_grpc: - self.requires("grpc/1.72.0", transitive_libs=True, transitive_headers=True) - self.requires("protobuf/5.27.0") + self.requires("grpc/1.54.3", transitive_libs=True, transitive_headers=True) + self.requires("protobuf/3.21.12") self.requires("libmount/2.39", override=True) if self.options.with_asio: @@ -53,3 +53,12 @@ def requirements(self): if self.options.with_cmake: self.tool_requires("cmake/3.29.3") + + def generate(self): + deps = CMakeDeps(self) + deps.generate() + tc = CMakeToolchain(self) + + if self.settings.compiler == "clang": + tc.extra_cxxflags.extend(['-Wno-missing-template-arg-list-after-template-kw']) + tc.generate() From 3bcdd0fac7e4b98b0b338a2343e264640227c7ec Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Fri, 5 Sep 2025 13:57:10 +0000 Subject: [PATCH 21/31] [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 43309838d..1d9848d52 100644 --- a/conanfile.py +++ b/conanfile.py @@ -53,7 +53,7 @@ def requirements(self): if self.options.with_cmake: self.tool_requires("cmake/3.29.3") - + def generate(self): deps = CMakeDeps(self) deps.generate() From 7fc86ec2b64cea54a2a0d17657592cbf2168ad9f Mon Sep 17 00:00:00 2001 From: Aleksey Loginov Date: Fri, 5 Sep 2025 17:16:46 +0300 Subject: [PATCH 22/31] Update conanfile.py --- conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conanfile.py b/conanfile.py index 1d9848d52..11cbe379f 100644 --- a/conanfile.py +++ b/conanfile.py @@ -59,6 +59,6 @@ def generate(self): deps.generate() tc = CMakeToolchain(self) - if self.settings.compiler == "clang": + if self.settings.compiler == "apple-clang": tc.extra_cxxflags.extend(['-Wno-missing-template-arg-list-after-template-kw']) tc.generate() From b9c1264ff6ad7dfe455d9b76312efed7906245f7 Mon Sep 17 00:00:00 2001 From: Aleksey Loginov Date: Fri, 5 Sep 2025 17:39:07 +0300 Subject: [PATCH 23/31] Update conanfile.py --- conanfile.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conanfile.py b/conanfile.py index 11cbe379f..5c860d6fc 100644 --- a/conanfile.py +++ b/conanfile.py @@ -44,8 +44,8 @@ def requirements(self): self.requires("sfml/2.6.1", options={"audio": False}) if self.options.with_grpc: - self.requires("grpc/1.54.3", transitive_libs=True, transitive_headers=True) - self.requires("protobuf/3.21.12") + self.requires("grpc/1.65.5", transitive_libs=True, transitive_headers=True) + self.requires("protobuf/5.26.1") self.requires("libmount/2.39", override=True) if self.options.with_asio: From a2c0ce7894021e7dc1396619b9fb9e01102280a7 Mon Sep 17 00:00:00 2001 From: Aleksey Loginov Date: Fri, 5 Sep 2025 17:42:06 +0300 Subject: [PATCH 24/31] Update conanfile.py --- conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conanfile.py b/conanfile.py index 5c860d6fc..1efee8e6a 100644 --- a/conanfile.py +++ b/conanfile.py @@ -44,7 +44,7 @@ def requirements(self): self.requires("sfml/2.6.1", options={"audio": False}) if self.options.with_grpc: - self.requires("grpc/1.65.5", transitive_libs=True, transitive_headers=True) + self.requires("grpc/1.65.0", transitive_libs=True, transitive_headers=True) self.requires("protobuf/5.26.1") self.requires("libmount/2.39", override=True) From a933311df8ee4c2ccbd996172eb53770b207f63f Mon Sep 17 00:00:00 2001 From: Aleksey Loginov Date: Fri, 5 Sep 2025 17:50:21 +0300 Subject: [PATCH 25/31] Update conanfile.py --- conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conanfile.py b/conanfile.py index 1efee8e6a..79e68b2cc 100644 --- a/conanfile.py +++ b/conanfile.py @@ -45,7 +45,7 @@ def requirements(self): if self.options.with_grpc: self.requires("grpc/1.65.0", transitive_libs=True, transitive_headers=True) - self.requires("protobuf/5.26.1") + # self.requires("protobuf/5.26.1") self.requires("libmount/2.39", override=True) if self.options.with_asio: From 7a75fbb419861569069b61e876e55da7bcbca8b0 Mon Sep 17 00:00:00 2001 From: Aleksey Loginov Date: Sat, 6 Sep 2025 12:12:57 +0300 Subject: [PATCH 26/31] Update conanfile.py --- conanfile.py | 8 -------- 1 file changed, 8 deletions(-) diff --git a/conanfile.py b/conanfile.py index 79e68b2cc..e4f28c8a1 100644 --- a/conanfile.py +++ b/conanfile.py @@ -54,11 +54,3 @@ def requirements(self): if self.options.with_cmake: self.tool_requires("cmake/3.29.3") - def generate(self): - deps = CMakeDeps(self) - deps.generate() - tc = CMakeToolchain(self) - - if self.settings.compiler == "apple-clang": - tc.extra_cxxflags.extend(['-Wno-missing-template-arg-list-after-template-kw']) - tc.generate() From 5c1f16032ab6fac16ad1908426d21fa36447fb74 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Sat, 6 Sep 2025 09:13:06 +0000 Subject: [PATCH 27/31] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- conanfile.py | 1 - 1 file changed, 1 deletion(-) diff --git a/conanfile.py b/conanfile.py index e4f28c8a1..4ef90ecc7 100644 --- a/conanfile.py +++ b/conanfile.py @@ -53,4 +53,3 @@ def requirements(self): if self.options.with_cmake: self.tool_requires("cmake/3.29.3") - From a8ffbeca027ef356e5036bd8445c955b1349f620 Mon Sep 17 00:00:00 2001 From: Aleksey Loginov Date: Sat, 6 Sep 2025 21:41:50 +0300 Subject: [PATCH 28/31] Update conanfile.py --- conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conanfile.py b/conanfile.py index 4ef90ecc7..ac4487fea 100644 --- a/conanfile.py +++ b/conanfile.py @@ -41,7 +41,7 @@ def requirements(self): self.requires("nanobench/4.3.11") if self.options.with_sfml: - self.requires("sfml/2.6.1", options={"audio": False}) + self.requires("sfml/2.6.2", options={"audio": False}) if self.options.with_grpc: self.requires("grpc/1.65.0", transitive_libs=True, transitive_headers=True) From ddbe8db1be6ae619b8e8137ca599d365b6bd1f07 Mon Sep 17 00:00:00 2001 From: Aleksey Loginov Date: Sat, 6 Sep 2025 22:33:07 +0300 Subject: [PATCH 29/31] sfml --- CMakePresets.json | 2 +- conanfile.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakePresets.json b/CMakePresets.json index 6200029db..0c65eb3d5 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -128,7 +128,7 @@ "name" : "build-sfml", "hidden": true, "cacheVariables": { - "RPP_BUILD_SFML_CODE" : "ON" + "RPP_BUILD_SFML_CODE" : "OFF" } }, { diff --git a/conanfile.py b/conanfile.py index ac4487fea..1606e6c4b 100644 --- a/conanfile.py +++ b/conanfile.py @@ -40,8 +40,8 @@ def requirements(self): if self.options.with_benchmarks: self.requires("nanobench/4.3.11") - if self.options.with_sfml: - self.requires("sfml/2.6.2", options={"audio": False}) + # if self.options.with_sfml: + # self.requires("sfml/2.6.2", options={"audio": False}) if self.options.with_grpc: self.requires("grpc/1.65.0", transitive_libs=True, transitive_headers=True) From ed57cf5e320eaed9a9d6279b290ae67741687c24 Mon Sep 17 00:00:00 2001 From: Aleksey Loginov Date: Tue, 9 Sep 2025 15:01:25 +0300 Subject: [PATCH 30/31] disable windows for now --- .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 86c4eb020..fab24a2b1 100644 --- a/.github/workflows/ci v2.yml +++ b/.github/workflows/ci v2.yml @@ -23,7 +23,7 @@ jobs: matrix: config: [{name: ci-ubuntu-gcc, os: ubuntu-22.04}, {name: ci-ubuntu-clang, os: ubuntu-22.04}, - {name: ci-windows, os: windows-latest}, + # {name: ci-windows, os: windows-latest}, {name: ci-macos, os: macos-latest}] build_type: [{config: Release}, {config: Debug}] @@ -137,7 +137,7 @@ jobs: matrix: config: [{name: ci-ubuntu-gcc, os: ubuntu-22.04}, {name: ci-ubuntu-clang, os: ubuntu-22.04}, - {name: ci-windows, os: windows-latest}, + # {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}] From bef3e69882e39b12cbd1c63fb1377a585875d066 Mon Sep 17 00:00:00 2001 From: Aleksey Loginov Date: Tue, 9 Sep 2025 16:27:56 +0300 Subject: [PATCH 31/31] Update analyzers.yml --- .github/workflows/analyzers.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/analyzers.yml b/.github/workflows/analyzers.yml index 07f1b3a4c..841fc0bf3 100644 --- a/.github/workflows/analyzers.yml +++ b/.github/workflows/analyzers.yml @@ -84,7 +84,7 @@ jobs: sonarcloud_and_coverage: runs-on: ubuntu-22.04 - if: github.repository_owner == 'victimsnino' && github.event.workflow_run.conclusion == 'success' + if: github.repository_owner == 'victimsnino' && github.event.workflow_run.conclusion == 'success' && false steps: - uses: haya14busa/action-workflow_run-status@main