From 0274ab2836d7c2f7821396ee2e2d60198baf616d Mon Sep 17 00:00:00 2001 From: Aleksey Loginov Date: Mon, 25 Aug 2025 11:50:34 +0300 Subject: [PATCH 1/6] fix ci --- .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 6c501fe50..d0f26edf9 100644 --- a/.github/workflows/ci v2.yml +++ b/.github/workflows/ci v2.yml @@ -40,6 +40,8 @@ jobs: with: python-version: '3.6.x - 3.11.x' + - run: pip install jinja2 + - name: get conan uses: turtlebrowser/get-conan@main From 5a15e2a748d7af6d12d2ef0f3c15f60a00b353ef Mon Sep 17 00:00:00 2001 From: Aleksey Loginov Date: Wed, 3 Sep 2025 23:19:38 +0300 Subject: [PATCH 2/6] Update ci v2.ymljinja --- .github/workflows/ci v2.yml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci v2.yml b/.github/workflows/ci v2.yml index d0f26edf9..c4c7d3608 100644 --- a/.github/workflows/ci v2.yml +++ b/.github/workflows/ci v2.yml @@ -40,11 +40,18 @@ jobs: with: python-version: '3.6.x - 3.11.x' - - run: pip install jinja2 - - name: get conan uses: turtlebrowser/get-conan@main + - name: Ensure Jinja2 available to Conan + shell: bash + run: | + if command -v pipx >/dev/null 2>&1; then + pipx inject --install conan "Jinja2>=3.1.5,<3.2" + else + python -m pip install --upgrade "Jinja2>=3.1.5,<3.2" + fi + - name: check cache uses: actions/cache@v4 id: check_cache From e2904cd8bc90bd22b48083836b41e6dfae74b98c Mon Sep 17 00:00:00 2001 From: Aleksey Loginov Date: Wed, 3 Sep 2025 23:21:14 +0300 Subject: [PATCH 3/6] Update ci v2.yml --- .github/workflows/ci v2.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/ci v2.yml b/.github/workflows/ci v2.yml index c4c7d3608..ad529e380 100644 --- a/.github/workflows/ci v2.yml +++ b/.github/workflows/ci v2.yml @@ -46,11 +46,7 @@ jobs: - name: Ensure Jinja2 available to Conan shell: bash run: | - if command -v pipx >/dev/null 2>&1; then - pipx inject --install conan "Jinja2>=3.1.5,<3.2" - else python -m pip install --upgrade "Jinja2>=3.1.5,<3.2" - fi - name: check cache uses: actions/cache@v4 From 9581875cf10a4e877d83c4f37c6853325c41fad6 Mon Sep 17 00:00:00 2001 From: Aleksey Loginov Date: Wed, 3 Sep 2025 23:36:01 +0300 Subject: [PATCH 4/6] Update conanfile.py --- conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conanfile.py b/conanfile.py index f8fbc9a53..6035dfa6a 100644 --- a/conanfile.py +++ b/conanfile.py @@ -32,7 +32,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.54.3", transitive_libs=True, transitive_headers=True) From c84cd76dfbf2358a1d9f30e3b845db0f158f2cb5 Mon Sep 17 00:00:00 2001 From: Aleksey Loginov Date: Thu, 4 Sep 2025 00:25:56 +0300 Subject: [PATCH 5/6] Update CMakePresets.json --- CMakePresets.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakePresets.json b/CMakePresets.json index 244068c2d..c70404ffd 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 -Wmissing-template-arg-list-after-template-kw" } }, { From 5f6f04fe1b5632beec172eaabb35ff84c125b393 Mon Sep 17 00:00:00 2001 From: Aleksey Loginov Date: Thu, 4 Sep 2025 00:29:44 +0300 Subject: [PATCH 6/6] Update CMakePresets.json --- CMakePresets.json | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/CMakePresets.json b/CMakePresets.json index c70404ffd..6c63a3a92 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 -Wmissing-template-arg-list-after-template-kw" + "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" } }, { @@ -59,6 +59,14 @@ "CMAKE_BUILD_TYPE": "Release" } }, + { + "name": "ci-macos", + "hidden": true, + "inherits": ["ci-unix"], + "cacheVariables": { + "CMAKE_CXX_FLAGS": "-Wmissing-template-arg-list-after-template-kw" + } + }, { "name": "ci-win64", "inherits": ["flags-windows"], @@ -219,7 +227,7 @@ }, { "name": "ci-macos-tests", - "inherits": ["ci-build", "build-tests", "build-examples", "build-qt", "build-grpc", "build-asio", "build-sfml", "ci-unix"] + "inherits": ["ci-build", "build-tests", "build-examples", "build-qt", "build-grpc", "build-asio", "build-sfml", "ci-macos"] }, { "name": "ci-ubuntu-clang-tests", @@ -242,7 +250,7 @@ { "name": "ci-macos-benchmarks", - "inherits": ["ci-build", "build-benchmarks", "ci-unix"] + "inherits": ["ci-build", "build-benchmarks", "ci-macos"] }, { "name": "ci-ubuntu-clang-benchmarks", @@ -264,7 +272,7 @@ "build-dir", "build-tests", "build-examples", - "ci-unix" + "ci-macos" ] }, { @@ -301,7 +309,7 @@ "inherits": [ "build-dir", "build-benchmarks", - "ci-unix" + "ci-macos" ] }, {