Skip to content

Commit 7da86c6

Browse files
jcarpentjcarpent
authored
Merge pull request #457 from jorisv/topic/improve_windows_support
Improve windows support
2 parents bd85768 + b3dafb3 commit 7da86c6

16 files changed

+312
-108
lines changed

‎.github/workflows/check-changelog.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
name: Check-changelog
1+
name: CI - Check-changelog
2+
23
on:
34
pull_request:
45
types: [assigned, opened, synchronize, reopened, labeled, unlabeled, edited]

‎.github/workflows/conda/environment_macos_linux.yml‎ renamed to ‎.github/workflows/conda/environment_all.yml‎

File renamed without changes.

‎.github/workflows/conda/environment_windows.yml‎

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

‎.github/workflows/jrl-cmakemodules.yml‎

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,24 @@
1-
name: JRL-cmakemodules
2-
on: [push,pull_request]
1+
name: CI - JRL-cmakemodules
2+
3+
on:
4+
push:
5+
paths-ignore:
6+
- 'doc/**'
7+
- '.gitlab-ci.yml'
8+
- '.gitignore'
9+
- '*.md'
10+
- 'LICENSE'
11+
- 'colcon.pkg'
12+
- '.pre-commit-config.yaml'
13+
pull_request:
14+
paths-ignore:
15+
- 'doc/**'
16+
- '.gitlab-ci.yml'
17+
- '.gitignore'
18+
- '*.md'
19+
- 'LICENSE'
20+
- 'colcon.pkg'
21+
- '.pre-commit-config.yaml'
322
concurrency:
423
group: ${{ github.workflow }}-${{ github.ref }}
524
cancel-in-progress: true

‎.github/workflows/linux.yml‎

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,24 @@
1-
name: Check build on linux
1+
name: CI - Linux via APT
22

3-
on: ["push", "pull_request"]
3+
on:
4+
push:
5+
paths-ignore:
6+
- 'doc/**'
7+
- '.gitlab-ci.yml'
8+
- '.gitignore'
9+
- '*.md'
10+
- 'LICENSE'
11+
- 'colcon.pkg'
12+
- '.pre-commit-config.yaml'
13+
pull_request:
14+
paths-ignore:
15+
- 'doc/**'
16+
- '.gitlab-ci.yml'
17+
- '.gitignore'
18+
- '*.md'
19+
- 'LICENSE'
20+
- 'colcon.pkg'
21+
- '.pre-commit-config.yaml'
422
concurrency:
523
group: ${{ github.workflow }}-${{ github.ref }}
624
cancel-in-progress: true

‎.github/workflows/macos-linux-conda.yml‎

Lines changed: 25 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,24 @@
1-
name: Conda-CI
2-
3-
on: [push,pull_request]
1+
name: CI - OSX/Linux via Conda
2+
3+
on:
4+
push:
5+
paths-ignore:
6+
- 'doc/**'
7+
- '.gitlab-ci.yml'
8+
- '.gitignore'
9+
- '*.md'
10+
- 'LICENSE'
11+
- 'colcon.pkg'
12+
- '.pre-commit-config.yaml'
13+
pull_request:
14+
paths-ignore:
15+
- 'doc/**'
16+
- '.gitlab-ci.yml'
17+
- '.gitignore'
18+
- '*.md'
19+
- 'LICENSE'
20+
- 'colcon.pkg'
21+
- '.pre-commit-config.yaml'
422
concurrency:
523
group: ${{ github.workflow }}-${{ github.ref }}
624
cancel-in-progress: true
@@ -42,7 +60,7 @@ jobs:
4260
with:
4361
submodules: recursive
4462

45-
- uses: actions/cache@v3
63+
- uses: actions/cache@v4
4664
with:
4765
path: .ccache
4866
key: ccache-macos-linux-conda-${{ matrix.os }}-${{ matrix.build_type }}-${{ matrix.cxx_options }}-${{ matrix.python-version }}-${{ github.sha }}
@@ -53,7 +71,7 @@ jobs:
5371
with:
5472
activate-environment: eigenpy
5573
auto-update-conda: true
56-
environment-file: .github/workflows/conda/environment_macos_linux.yml
74+
environment-file: .github/workflows/conda/environment_all.yml
5775
python-version: ${{ matrix.python-version }}
5876
auto-activate-base: false
5977

@@ -62,7 +80,7 @@ jobs:
6280
with:
6381
activate-environment: eigenpy
6482
auto-update-conda: true
65-
environment-file: .github/workflows/conda/environment_macos_linux.yml
83+
environment-file: .github/workflows/conda/environment_all.yml
6684
python-version: ${{ matrix.python-version }}
6785
auto-activate-base: false
6886
installer-url: https://github.com/conda-forge/miniforge/releases/download/23.11.0-0/Mambaforge-23.11.0-0-MacOSX-arm64.sh
@@ -84,7 +102,7 @@ jobs:
84102
-DGENERATE_PYTHON_STUBS=ON \
85103
-DCMAKE_BUILD_TYPE=${{ matrix.build_type }} \
86104
-DCMAKE_CXX_FLAGS=${{ matrix.cxx_options }}
87-
cmake --build . -j2
105+
cmake --build . -j4
88106
ctest --output-on-failure
89107
cmake --install .
90108

‎.github/workflows/reloc.yml‎

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,24 @@
1-
name: Ensure relocatable
1+
name: CI - Ensure relocatable
22

3-
on: [push,pull_request]
3+
on:
4+
push:
5+
paths-ignore:
6+
- 'doc/**'
7+
- '.gitlab-ci.yml'
8+
- '.gitignore'
9+
- '*.md'
10+
- 'LICENSE'
11+
- 'colcon.pkg'
12+
- '.pre-commit-config.yaml'
13+
pull_request:
14+
paths-ignore:
15+
- 'doc/**'
16+
- '.gitlab-ci.yml'
17+
- '.gitignore'
18+
- '*.md'
19+
- 'LICENSE'
20+
- 'colcon.pkg'
21+
- '.pre-commit-config.yaml'
422
concurrency:
523
group: ${{ github.workflow }}-${{ github.ref }}
624
cancel-in-progress: true

‎.github/workflows/ros_ci.yml‎

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,28 @@
11
# This config uses industrial_ci (https://github.com/ros-industrial/industrial_ci.git).
22
# For troubleshooting, see readme (https://github.com/ros-industrial/industrial_ci/blob/master/README.rst)
33

4-
name: ROS-CI
4+
name: CI - Linux via ROS
55

66
# This determines when this workflow is run
7-
on: [push, pull_request] # on all pushes and PRs
7+
on:
8+
push:
9+
paths-ignore:
10+
- 'doc/**'
11+
- '.gitlab-ci.yml'
12+
- '.gitignore'
13+
- '*.md'
14+
- 'LICENSE'
15+
- 'colcon.pkg'
16+
- '.pre-commit-config.yaml'
17+
pull_request:
18+
paths-ignore:
19+
- 'doc/**'
20+
- '.gitlab-ci.yml'
21+
- '.gitignore'
22+
- '*.md'
23+
- 'LICENSE'
24+
- 'colcon.pkg'
25+
- '.pre-commit-config.yaml'
826
concurrency:
927
group: ${{ github.workflow }}-${{ github.ref }}
1028
cancel-in-progress: true

‎.github/workflows/windows-conda.yml‎

Lines changed: 39 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,24 @@
1-
name: Build Eigenpy on Windows via Conda
2-
on: [push,pull_request]
1+
name: CI - Windows via Conda
2+
3+
on:
4+
push:
5+
paths-ignore:
6+
- 'doc/**'
7+
- '.gitlab-ci.yml'
8+
- '.gitignore'
9+
- '*.md'
10+
- 'LICENSE'
11+
- 'colcon.pkg'
12+
- '.pre-commit-config.yaml'
13+
pull_request:
14+
paths-ignore:
15+
- 'doc/**'
16+
- '.gitlab-ci.yml'
17+
- '.gitignore'
18+
- '*.md'
19+
- 'LICENSE'
20+
- 'colcon.pkg'
21+
- '.pre-commit-config.yaml'
322
concurrency:
423
group: ${{ github.workflow }}-${{ github.ref }}
524
cancel-in-progress: true
@@ -17,32 +36,34 @@ jobs:
1736
fail-fast: false
1837
matrix:
1938
os: [windows-latest]
39+
compiler: ["cl", "clang-cl"]
2040

2141
steps:
2242
- uses: actions/checkout@v4
2343
with:
2444
submodules: recursive
2545

46+
- uses: actions/cache@v4
47+
with:
48+
path: .ccache
49+
key: ccache-windows-conda-${{ matrix.compiler }}-${{ matrix.os }}-${{ github.sha }}
50+
restore-keys: ccache-windows-conda-${{ matrix.compiler }}-${{ matrix.os }}-
51+
2652
- uses: conda-incubator/setup-miniconda@v3
2753
with:
2854
activate-environment: eigenpy
2955
auto-update-conda: true
30-
environment-file: .github/workflows/conda/environment_windows.yml
56+
environment-file: .github/workflows/conda/environment_all.yml
3157
python-version: "3.10"
3258
auto-activate-base: false
3359

34-
- uses: actions/cache@v3
35-
with:
36-
path: .ccache
37-
key: ccache-windows-conda-${{ matrix.os }}-${{ github.sha }}
38-
restore-keys: ccache-windows-conda-${{ matrix.os }}-
39-
4060
- name: Build Eigenpy
4161
shell: cmd /C CALL {0}
62+
env:
63+
CC: ${{ matrix.compiler }}
64+
CXX: ${{ matrix.compiler }}
4265
run: |
43-
:: start building
44-
call "%programfiles%\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" amd64
45-
if errorlevel 1 exit 1
66+
call conda list
4667
4768
mkdir build
4869
pushd build
@@ -57,14 +78,17 @@ jobs:
5778
..
5879
if errorlevel 1 exit 1
5980
60-
:: Build and Install
61-
cmake --build . -j3 --config Release --target install
81+
:: Build
82+
cmake --build . -j4
6283
if errorlevel 1 exit 1
6384
6485
:: Testing
65-
ctest --output-on-failure -C Release -V
86+
ctest --output-on-failure
6687
if errorlevel 1 exit 1
6788
89+
:: Install
90+
cmake --install .
91+
6892
:: Test Python import
6993
cd ..
7094
python -c "import eigenpy"

‎.pre-commit-config.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ repos:
88
args:
99
- --fix
1010
- --exit-non-zero-on-fix
11+
- --ignore
12+
- UP036
1113
- id: ruff-format
1214
- repo: https://github.com/cheshirekow/cmake-format-precommit
1315
rev: v0.6.13

0 commit comments

Comments
 (0)