Skip to content

Commit abf9a4d

Browse files
authored
Merge branch 'main' into mock_hardware_tests
2 parents 3201f73 + f2a8380 commit abf9a4d

Some content is hidden

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

42 files changed

+695
-450
lines changed

.github/ISSUE_TEMPLATE/ros2_bug.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ body:
2828
- Galactic
2929
- Humble
3030
- Iron
31+
- Jazzy
32+
- Kilted
3133
- Rolling
3234
- Other
3335
validations:

.github/workflows/check_links.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
check_links:
1111
runs-on: ubuntu-latest
1212
steps:
13-
- uses: actions/checkout@v4
13+
- uses: actions/checkout@v5
1414
- name: Restore lychee cache
1515
id: restore-cache
1616
uses: actions/cache/restore@v4

.github/workflows/ci-format.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ jobs:
1515
name: Format
1616
runs-on: ubuntu-22.04
1717
steps:
18-
- uses: actions/checkout@v4
19-
- uses: actions/setup-python@v5
18+
- uses: actions/checkout@v5
19+
- uses: actions/setup-python@v6
2020
with:
2121
python-version: 3.10.4
2222
- name: Install system hooks

.github/workflows/coverage-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
with:
2121
required-ros-distributions: ${{ env.ROS_DISTRO }}
2222
use-ros2-testing: true
23-
- uses: actions/checkout@v4
23+
- uses: actions/checkout@v5
2424
- uses: ros-tooling/[email protected]
2525
with:
2626
target-ros2-distro: ${{ env.ROS_DISTRO }}

.github/workflows/foxy-binary-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
BEFORE_INIT: 'apt-get update -qq && apt-get install -y iproute2 iputils-ping && ip addr && ping -c5 192.168.56.101'
2020
IMMEDIATE_TEST_OUTPUT: true
2121
steps:
22-
- uses: actions/checkout@v4
22+
- uses: actions/checkout@v5
2323
with:
2424
ref: foxy
2525
- name: start ursim

.github/workflows/galactic-binary-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
NOT_TEST_BUILD: true
1818
NOT_TEST_DOWNSTREAM: true
1919
steps:
20-
- uses: actions/checkout@v4
20+
- uses: actions/checkout@v5
2121
with:
2222
ref: galactic
2323
- uses: 'ros-industrial/industrial_ci@master'

.github/workflows/reusable_ici.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,10 @@ jobs:
4646
steps:
4747
- name: Checkout ${{ github.ref_name }} since build is not scheduled
4848
if: ${{ github.event_name != 'schedule' }}
49-
uses: actions/checkout@v4
49+
uses: actions/checkout@v5
5050
- name: Checkout ${{ inputs.ref_for_scheduled_build }} on scheduled build
5151
if: ${{ github.event_name == 'schedule' }}
52-
uses: actions/checkout@v4
52+
uses: actions/checkout@v5
5353
with:
5454
ref: ${{ inputs.ref_for_scheduled_build }}
5555
- run: docker network create --subnet=192.168.56.0/24 ursim_net

.github/workflows/update-ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ jobs:
1414
runs-on: ubuntu-latest
1515
steps:
1616
# Setup pre-commit
17-
- uses: actions/checkout@v4
18-
- uses: actions/setup-python@v5
17+
- uses: actions/checkout@v5
18+
- uses: actions/setup-python@v6
1919
with:
2020
python-version: 3.10.4
2121
- name: Install pre-commit

.pre-commit-config.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
repos:
1616
# Standard hooks
1717
- repo: https://github.com/pre-commit/pre-commit-hooks
18-
rev: v5.0.0
18+
rev: v6.0.0
1919
hooks:
2020
- id: check-added-large-files
2121
- id: check-ast
@@ -29,7 +29,7 @@ repos:
2929
- id: end-of-file-fixer
3030
- id: mixed-line-ending
3131
- id: trailing-whitespace
32-
- id: check-byte-order-marker # Forbid UTF-8 byte-order markers
32+
- id: fix-byte-order-marker # Forbid UTF-8 byte-order markers
3333

3434
# Python hooks
3535
- repo: https://github.com/asottile/pyupgrade
@@ -87,7 +87,7 @@ repos:
8787
args: ["--linelength=120"]
8888

8989
- repo: https://github.com/pre-commit/mirrors-clang-format
90-
rev: 'v20.1.8'
90+
rev: 'v21.1.0'
9191
hooks:
9292
- id: clang-format
9393

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ For getting started, you'll basically need three steps:
124124
details.
125125

126126
```bash
127-
# Replace ur5e with one of ur3, ur3e, ur5, ur5e, ur7e, ur10, ur10e, ur12e, ur16e, ur15, ur20, ur30
127+
# Replace ur5e with one of ur3, ur5, ur10, ur3e, ur5e, ur7e, ur10e, ur12e, ur16e, ur8long, ur15, ur20, ur30
128128
# Replace the IP address with the IP address of your actual robot / URSim
129129
ros2 launch ur_robot_driver ur_control.launch.py ur_type:=ur5e robot_ip:=192.168.56.101
130130
```

0 commit comments

Comments
 (0)