Skip to content

Commit 86cbc3a

Browse files
Merge branch 'main' into floating-point-infinity
2 parents 90bf157 + 0346fde commit 86cbc3a

Some content is hidden

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

59 files changed

+1878
-923
lines changed

.github/workflows/ci.yaml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,10 @@ jobs:
1616
fail-fast: false
1717
matrix:
1818
env:
19-
# Werror is not enabled on humble and iron because of gtest
2019
- ROS_DISTRO: rolling
2120
ROS_REPO: testing
22-
CMAKE_ARGS: -DCMAKE_CXX_FLAGS=-Werror
2321
- ROS_DISTRO: rolling
2422
ROS_REPO: main
25-
CMAKE_ARGS: -DCMAKE_CXX_FLAGS=-Werror
2623
- ROS_DISTRO: iron
2724
ROS_REPO: testing
2825
- ROS_DISTRO: iron
@@ -39,19 +36,19 @@ jobs:
3936
name: ${{ matrix.env.ROS_DISTRO }}-${{ matrix.env.ROS_REPO }}
4037
runs-on: ubuntu-latest
4138
steps:
42-
- uses: actions/checkout@v2
39+
- uses: actions/checkout@v4
4340
- id: ici
4441
name: Run industrial_ci
4542
uses: ros-industrial/industrial_ci@master
4643
env: ${{ matrix.env }}
4744
- name: Upload test artifacts (on failure)
48-
uses: actions/upload-artifact@v2
45+
uses: actions/upload-artifact@v4
4946
if: failure() && (steps.ici.outputs.run_target_test || steps.ici.outputs.target_test_results)
5047
with:
5148
name: test-results-${{ matrix.env.NAME }}
5249
path: ${{ env.BASEDIR }}/target_ws/**/test_results/**/*.xml
5350
- name: Upload log artifacts (on failure)
54-
uses: actions/upload-artifact@v2
51+
uses: actions/upload-artifact@v4
5552
if: failure()
5653
with:
5754
name: test-results-${{ matrix.env.NAME }}

.github/workflows/format.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ jobs:
1515
name: pre-commit
1616
runs-on: ubuntu-22.04
1717
steps:
18-
- uses: actions/checkout@v2
19-
- uses: actions/setup-python@v2
18+
- uses: actions/checkout@v4
19+
- uses: actions/setup-python@v5
2020
- name: Install clang-format
2121
run: sudo apt-get install clang-format
22-
- uses: pre-commit/action@v2.0.3
22+
- uses: pre-commit/action@v3.0.1
2323
id: precommit
2424
- name: Upload pre-commit changes
2525
if: failure() && steps.precommit.outcome == 'failure'

.gitignore

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,5 @@
1-
**__pycache__**
1+
**/__pycache__
2+
build
3+
install
4+
log
5+
*.egg-info

.pre-commit-config.yaml

Lines changed: 4 additions & 8 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: v4.4.0
18+
rev: v5.0.0
1919
hooks:
2020
- id: check-added-large-files
2121
args: ['--maxkb=1000']
@@ -47,18 +47,14 @@ repos:
4747
- id: requirements-txt-fixer
4848
- id: sort-simple-yaml
4949
- id: trailing-whitespace
50+
- id: double-quote-string-fixer
5051

5152
- repo: https://github.com/psf/black
52-
rev: 23.3.0
53+
rev: 24.10.0
5354
hooks:
5455
- id: black
5556
args: ["--skip-string-normalization"]
5657

57-
- repo: https://github.com/pre-commit/pre-commit-hooks
58-
rev: v4.4.0
59-
hooks:
60-
- id: double-quote-string-fixer
61-
6258
- repo: local
6359
hooks:
6460
- id: clang-format
@@ -70,7 +66,7 @@ repos:
7066
args: ['-fallback-style=none', '-i']
7167

7268
- repo: https://github.com/codespell-project/codespell
73-
rev: v2.2.4
69+
rev: v2.3.0
7470
hooks:
7571
- id: codespell
7672
args: ['--write-changes']

0 commit comments

Comments
 (0)