diff --git a/.github/workflows/ci v2.yml b/.github/workflows/ci v2.yml index 6c501fe50..ad529e380 100644 --- a/.github/workflows/ci v2.yml +++ b/.github/workflows/ci v2.yml @@ -43,6 +43,11 @@ jobs: - name: get conan uses: turtlebrowser/get-conan@main + - name: Ensure Jinja2 available to Conan + shell: bash + run: | + python -m pip install --upgrade "Jinja2>=3.1.5,<3.2" + - name: check cache uses: actions/cache@v4 id: check_cache diff --git a/CMakePresets.json b/CMakePresets.json index 244068c2d..6c63a3a92 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -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" ] }, { 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)