Skip to content

Commit 581b87b

Browse files
committed
Use ninja again
1 parent 82d521e commit 581b87b

4 files changed

Lines changed: 7 additions & 33 deletions

File tree

.github/workflows/ci.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ jobs:
1414
with:
1515
cancel_others: 'true'
1616

17-
# Remove comments to spawn an interactive debugging ssh shell in the ci
18-
- name: Setup tmate session
19-
uses: mxschmitt/action-tmate@v3
20-
with:
21-
detached: true
17+
# Remove comments to spawn an interactive debugging ssh shell in the ci
18+
# - name: Setup tmate session
19+
# uses: mxschmitt/action-tmate@v3
20+
# with:
21+
# detached: true
2222

2323
- name: Check out repository
2424
uses: actions/checkout@v4

pixi.lock

Lines changed: 0 additions & 25 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pixi.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ deploy = {cmd = "scripts/deploy_robots.py", description = "Deploys the current e
1616
format = {cmd = "pre-commit run --all-files", description = "Runs code formatting and linting."}
1717

1818
[tasks.build]
19-
cmd = "colcon build --symlink-install --cmake-args -G 'Unix Makefiles' "
19+
cmd = "colcon build --symlink-install --cmake-args -G Ninja --event-handlers console_cohesion+"
2020
description = "Builds all ROS 2 packages. Add --packages-select <package names> to build specific packages."
2121

2222
[tasks.clean]
@@ -198,7 +198,6 @@ pillow = "<12" # this constraint is needed as yoeo specifies the 11 major versio
198198
setuptools = "==68.1.2" # Pinning setuptools to avoid issues with colcon build
199199
git = ">=2.52.0,<3" # Otherwise the system git might be used causing ABI issues
200200
curl = ">=8.17.0,<9"
201-
make = ">=4.4.1,<5" # To avoid issues in the CI
202201

203202
[feature.ros.target.linux-64.dependencies]
204203
# For now Webots is only packaged for x86-64 Linux

src/bitbots_misc/bitbots_docs/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ file(COPY files DESTINATION ${CMAKE_INSTALL_PREFIX}/share/${PROJECT_NAME})
99

1010
# we cannot use the compiled catkin package of bitbots_docs since that would
1111
# require this package to depend on itself. therefore we need to compile the sub
12-
# cmake file ourselves and include it manualy
12+
# cmake file ourselves and include it manually
1313
configure_file(cmake/enable_bitbots_docs.cmake.in
1414
${CMAKE_BINARY_DIR}/enable_bitbots_docs.cmake @ONLY)
1515
include(${CMAKE_BINARY_DIR}/enable_bitbots_docs.cmake)

0 commit comments

Comments
 (0)