Skip to content

Commit 81794fb

Browse files
committed
Merge remote-tracking branch 'origin/main' into fix/docs
2 parents 4438f57 + 3072979 commit 81794fb

235 files changed

Lines changed: 34757 additions & 17105 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/dependabot.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
# Set update schedule for GitHub Actions
2+
3+
version: 2
4+
updates:
5+
6+
- package-ecosystem: "github-actions"
7+
directory: "/"
8+
schedule:
9+
# Check for updates to GitHub Actions every week
10+
interval: "weekly"

.github/pull_request_template.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
## Related issues
88
<!--- Mention (link) related issues. -->
99
<!--- If you suggest a new feature, please discuss it in an issue first. -->
10-
<!--- If fixing a bug, there should be an issue describing it with steps to reproduce -->
10+
<!--- If fixing a bug, there should be an issue describing it with steps to reproduce. -->
1111

1212
## Checklist
1313

14-
- [ ] Run `just build`
14+
- [ ] Run `pixi run build`
1515
- [ ] Write documentation
1616
- [ ] Test on your machine
1717
- [ ] Test on the robot

.github/workflows/ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: Build & Test
22
on:
33
schedule:
4-
- cron: '0 0 * * *'
4+
- cron: '12 3 * * *'
55
push:
66

77
jobs:
@@ -12,7 +12,7 @@ jobs:
1212

1313
steps:
1414
- name: Cancel outdated jobs
15-
uses: fkirc/skip-duplicate-actions@v5
15+
uses: fkirc/skip-duplicate-actions@v5.3.1
1616
with:
1717
cancel_others: 'true'
1818

@@ -23,7 +23,7 @@ jobs:
2323
# detached: true
2424

2525
- name: Check out repository
26-
uses: actions/checkout@v4
26+
uses: actions/checkout@v6.0.2
2727

2828
- name: Configure git to trust repository
2929
run: git config --global --add safe.directory /__w/bitbots_main/bitbots_main
@@ -32,7 +32,7 @@ jobs:
3232
run: scripts/make_basler.sh --ci
3333

3434
- name: Set up workspace
35-
uses: prefix-dev/setup-pixi@v0.9.3
35+
uses: prefix-dev/setup-pixi@v0.9.5
3636
with:
3737
pixi-version: v0.63.1
3838
cache: true

.github/workflows/pre-commit.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ on:
55

66
jobs:
77
pre-commit:
8-
runs-on: ubuntu-latest
8+
runs-on: ubuntu-slim
99
steps:
1010
- name: Check out repository
11-
uses: actions/checkout@v4
11+
uses: actions/checkout@v6
1212

1313
- name: Set up workspace
14-
uses: prefix-dev/setup-pixi@v0.9.3
14+
uses: prefix-dev/setup-pixi@v0.9.5
1515
with:
1616
pixi-version: v0.59.0
1717
cache: true

.pre-commit-config.yaml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
exclude: |
2+
(?x)(
3+
^src/lib/|
4+
^src/bitbots_team_communication/bitbots_team_communication/bitbots_team_communication/RobocupProtocol/
5+
)
6+
17
repos:
28
- repo: https://github.com/astral-sh/ruff-pre-commit
39
rev: v0.9.6
@@ -14,7 +20,6 @@ repos:
1420
args:
1521
- "-i"
1622
- id: cppcheck
17-
exclude: &exclude_robocup_protocol ^src/bitbots_team_communication/bitbots_team_communication/bitbots_team_communication/RobocupProtocol/
1823
args:
1924
- "--inline-suppr"
2025
- "--suppress=missingIncludeSystem"
@@ -28,13 +33,11 @@ repos:
2833
hooks:
2934
- id: cmake-format
3035
- id: cmake-lint
31-
exclude: *exclude_robocup_protocol
3236
- repo: https://github.com/pre-commit/pre-commit-hooks
3337
rev: v5.0.0
3438
hooks:
3539
- id: check-merge-conflict
3640
- id: check-toml
3741
- id: check-xml
3842
- id: check-yaml
39-
exclude: *exclude_robocup_protocol
4043
- id: detect-private-key

.rsyncignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ src/bitbots_misc/bitbots_parameter_blackboard/config/game_settings.yaml
1717
*.idea
1818
*.pyc
1919
*.vscode
20+
*.devcontainer
2021

2122
__pycache__
2223

.vscode/extensions.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@
1818
"ms-vscode.cpptools-themes", // C++ support
1919
"ms-vscode.cpptools", // C++ support
2020
"njpwerner.autodocstring", // Generates docstrings
21+
"Plex.vscode-protolint", // Protobuf support
2122
"streetsidesoftware.code-spell-checker-german", // Spell checker
2223
"streetsidesoftware.code-spell-checker", // Spell checker
2324
"tamasfe.even-better-toml", // TOML support
2425
"trond-snekvik.simple-rst", // Syntax highlighting for rst files
2526
"twxs.cmake", // CMake support
26-
"zxh404.vscode-proto3", // Protobuf support
2727
]
2828
}

README.md

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,19 @@ All code is written as individual ROS 2 packages.
1515

1616
The workspace is managed using the [pixi](https://pixi.sh) package manager. This allows us to have reproducible builds and easy user space dependency management similar to tools like `uv` or `cargo`. This also means that no system wide ROS installation or superuser privileges are required to install or run the code.
1717

18-
Follow our [installation guide](https://docs.bit-bots.de/meta/manual/tutorials/installation.html) for a quick installation or step-by-step instructions.
18+
Full step-by-step instructions for installing the Bit-Bots software stack and ROS 2 can be found in our [documentation](https://docs.bit-bots.de/meta/manual/tutorials/install_software_ros2.html).
19+
20+
Run the following command inside this repository to build the workspace.
21+
All dependencies will be installed automatically.
22+
Make sure you have [pixi](https://pixi.sh) installed.
23+
A few optional proprietary dependencies will be needed for full functionality, see the documentation for details.
24+
25+
``` shell
26+
pixi run build
27+
```
28+
29+
The first build might fail due to missing dependencies.
30+
Run `pixi run basler` to install the Basler pylon camera driver.
1931

2032
## Using the workspace
2133

0 commit comments

Comments
 (0)