Skip to content

Commit 26845b1

Browse files
authored
Merge pull request #28 from ahoarau/jrl-next
Refactor CMake with JRL CMake Modules v2
2 parents 6082bb4 + af427c7 commit 26845b1

Some content is hidden

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

47 files changed

+2508
-2328
lines changed

.gersemirc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
definitions: [./CMakeLists.txt, ./cmake, ./tests]
2-
line_length: 80
1+
definitions: [./CMakeLists.txt, ./tests]
2+
line_length: 100
33
indent: 2
44
warn_about_unknown_commands: false

.github/workflows/macos-linux-windows-pixi.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,6 @@ jobs:
5555

5656
steps:
5757
- uses: actions/checkout@v6
58-
with:
59-
submodules: recursive
6058

6159
- uses: actions/cache@v4
6260
with:
@@ -73,19 +71,23 @@ jobs:
7371
run: |
7472
pixi run -e ${{ matrix.environment }} ccache -z
7573
76-
- name: Build nanoeigenpy [MacOS/Linux/Windows]
74+
- name: Configure nanoeigenpy [MacOS/Linux/Windows]
7775
env:
7876
NANOEIGENPY_BUILD_TYPE: ${{ matrix.build_type }}
77+
run: |
78+
pixi run -e ${{ matrix.environment }} configure
79+
80+
- name: Build nanoeigenpy [MacOS/Linux/Windows]
7981
run: |
8082
pixi run -e ${{ matrix.environment }} build
8183
8284
- name: Test nanoeigenpy [MacOS/Linux/Windows]
8385
run: |
84-
pixi run -e ${{ matrix.environment }} ctest --test-dir build --output-on-failure
86+
pixi run -e ${{ matrix.environment }} test
8587
8688
- name: Install nanoeigenpy [MacOS/Linux/Windows]
8789
run: |
88-
pixi run -e ${{ matrix.environment }} cmake --build build --target install
90+
pixi run -e ${{ matrix.environment }} install
8991
9092
- name: Show ccache statistics [MacOS/Linux/Windows]
9193
run: |
@@ -102,14 +104,12 @@ jobs:
102104

103105
steps:
104106
- uses: actions/checkout@v6
105-
with:
106-
submodules: recursive
107107

108108
- uses: prefix-dev/[email protected]
109109
env:
110110
CMAKE_BUILD_PARALLEL_LEVEL: 2
111111
with:
112-
cache: true
112+
cache: false # ⚠️ Disabling cache for testing ⚠️
113113
environments: test-pixi-build
114114

115115
- name: Test package [MacOS/Linux/Windows]

.github/workflows/ros_ci.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,12 @@ jobs:
3131
env:
3232
# PRERELEASE: true # Fails due to issues in the underlying Docker image
3333
BUILDER: colcon
34+
VERBOSE_OUTPUT: true
35+
VERBOSE_TESTS: true
36+
DEBUG_BASH: true
3437
runs-on: ubuntu-latest
3538
steps:
3639
- uses: actions/checkout@v6
37-
with:
38-
submodules: recursive
3940
# Run industrial_ci
4041
- uses: 'ros-industrial/industrial_ci@ba2a3d0f830f8051b356711a8df2fedfc5d256cf'
4142
env: ${{ matrix.env }}

.gitignore

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,16 @@
11
build*/
2+
install*/
3+
.pytest_cache/
24
.cache/
3-
__pycache__
4-
.pytest_cache
5-
6-
# pixi environments
7-
.pixi
5+
.pixi/
6+
__pycache__/
7+
Xcode*
8+
*.pyc
9+
*~
810
*.egg-info
11+
.ruff_cache
12+
.DS_Store
13+
compile_commands.json
14+
cmake-profiling.json
15+
result
16+
*.conda

.gitmodules

Lines changed: 0 additions & 6 deletions
This file was deleted.

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
1414
- Python version update ([#25](https://github.com/Simple-Robotics/nanoeigenpy/pull/25)):
1515
- Project is now tested with Python 3.10 and 3.14
1616
- Python 3.10 is the minimal supported Python version
17+
- Switch to [JRL CMake modules v2](https://github.com/jrl-umi3218/jrl-cmakemodules/pull/798) ([#28](https://github.com/Simple-Robotics/nanoeigenpy/pull/28))
1718

1819
### Added
1920
- Add pixi-build support ([#25](https://github.com/Simple-Robotics/nanoeigenpy/pull/25))

0 commit comments

Comments
 (0)