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 diff --git a/.github/workflows/ci v2.yml b/.github/workflows/ci v2.yml index 6c501fe50..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}] @@ -37,8 +37,7 @@ jobs: fetch-depth: 0 - uses: actions/setup-python@v5 - with: - python-version: '3.6.x - 3.11.x' + with: { python-version: "3.8" } - name: get conan uses: turtlebrowser/get-conan@main @@ -138,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}] diff --git a/CMakePresets.json b/CMakePresets.json index 244068c2d..0c65eb3d5 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" } }, { @@ -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 f8fbc9a53..1606e6c4b 100644 --- a/conanfile.py +++ b/conanfile.py @@ -23,6 +23,15 @@ class RppConan(ConanFile): "with_asio" : False } + 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: self.requires("trompeloeil/48") @@ -31,12 +40,12 @@ def requirements(self): if self.options.with_benchmarks: self.requires("nanobench/4.3.11") - if self.options.with_sfml: - self.requires("sfml/2.6.1", 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.54.3", transitive_libs=True, transitive_headers=True) - self.requires("protobuf/3.21.12") + 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) if self.options.with_asio: