Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
1f7ce04
jinja2
AlexInLog Sep 4, 2025
b160606
Update ci v2.yml
AlexInLog Sep 4, 2025
f1f5f46
Update ci v2.yml
AlexInLog Sep 4, 2025
4a8849f
Update ci v2.yml
AlexInLog Sep 4, 2025
1d72546
Update ci v2.yml
AlexInLog Sep 4, 2025
097f3b9
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Sep 4, 2025
960d5b1
Update ci v2.yml
AlexInLog Sep 5, 2025
71da089
Update ci v2.yml
AlexInLog Sep 5, 2025
2273c54
Update ci v2.yml
AlexInLog Sep 5, 2025
af82c9a
Update ci v2.yml
AlexInLog Sep 5, 2025
5833f8b
Update ci v2.yml
AlexInLog Sep 5, 2025
ac42aa6
Update ci v2.yml
AlexInLog Sep 5, 2025
b13606c
Update conanfile.py
AlexInLog Sep 5, 2025
b477668
Update ci v2.yml
AlexInLog Sep 5, 2025
394508d
Update conanfile.py
AlexInLog Sep 5, 2025
c063a95
Update conanfile.py
AlexInLog Sep 5, 2025
aa66073
Update CMakePresets.json
AlexInLog Sep 5, 2025
260b921
Update conanfile.py
AlexInLog Sep 5, 2025
939f91f
Update conanfile.py
AlexInLog Sep 5, 2025
6ced3b4
Update conanfile.py
AlexInLog Sep 5, 2025
3bcdd0f
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Sep 5, 2025
7fc86ec
Update conanfile.py
AlexInLog Sep 5, 2025
b9c1264
Update conanfile.py
AlexInLog Sep 5, 2025
a2c0ce7
Update conanfile.py
AlexInLog Sep 5, 2025
a933311
Update conanfile.py
AlexInLog Sep 5, 2025
7a75fbb
Update conanfile.py
AlexInLog Sep 6, 2025
5c1f160
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Sep 6, 2025
a8ffbec
Update conanfile.py
AlexInLog Sep 6, 2025
ddbe8db
sfml
AlexInLog Sep 6, 2025
ed57cf5
disable windows for now
AlexInLog Sep 9, 2025
bef3e69
Update analyzers.yml
AlexInLog Sep 9, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/analyzers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 3 additions & 4 deletions .github/workflows/ci v2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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}]

Expand All @@ -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
Expand Down Expand Up @@ -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}]
Expand Down
4 changes: 2 additions & 2 deletions CMakePresets.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
},
{
Expand Down Expand Up @@ -128,7 +128,7 @@
"name" : "build-sfml",
"hidden": true,
"cacheVariables": {
"RPP_BUILD_SFML_CODE" : "ON"
"RPP_BUILD_SFML_CODE" : "OFF"
}
},
{
Expand Down
17 changes: 13 additions & 4 deletions conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand All @@ -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:
Expand Down
Loading