Skip to content

Commit 11654ef

Browse files
github-actions[bot]mergify[bot]
authored andcommitted
Bump version of pre-commit hooks (#3055)
(cherry picked from commit 4c7228f) # Conflicts: # hardware_interface_testing/test/test_components/test_actuator.cpp
1 parent 231518c commit 11654ef

2 files changed

Lines changed: 15 additions & 2 deletions

File tree

.pre-commit-config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ repos:
6363

6464
# CPP hooks
6565
- repo: https://github.com/pre-commit/mirrors-clang-format
66-
rev: v21.1.8
66+
rev: v22.1.0
6767
hooks:
6868
- id: clang-format
6969
args: ['-fallback-style=none', '-i']
@@ -133,7 +133,7 @@ repos:
133133
exclude: CHANGELOG\.rst|\.(svg|pyc|drawio)$
134134

135135
- repo: https://github.com/python-jsonschema/check-jsonschema
136-
rev: 0.36.1
136+
rev: 0.37.0
137137
hooks:
138138
- id: check-github-workflows
139139
args: ["--verbose"]

hardware_interface_testing/test/test_components/test_actuator.cpp

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,20 @@ class TestActuator : public ActuatorInterface
9090
const std::vector<std::string> & /*start_interfaces*/,
9191
const std::vector<std::string> & /*stop_interfaces*/) override
9292
{
93+
<<<<<<< HEAD
9394
position_state_ += 100.0;
95+
=======
96+
if (get_hardware_info().hardware_parameters.count("fail_on_perform_mode_switch"))
97+
{
98+
if (
99+
hardware_interface::parse_bool(
100+
get_hardware_info().hardware_parameters.at("fail_on_perform_mode_switch")))
101+
{
102+
return hardware_interface::return_type::ERROR;
103+
}
104+
}
105+
position_state_ += 0.1;
106+
>>>>>>> 4c7228f (Bump version of pre-commit hooks (#3055))
94107
return hardware_interface::return_type::OK;
95108
}
96109

0 commit comments

Comments
 (0)