Skip to content

Commit 4e9de19

Browse files
authored
Merge pull request InsightSoftwareConsortium#5567 from InsightSoftwareConsortium/simplify-pixi-build
COMP: Simplify pixi configure/build/test
2 parents b182514 + f620940 commit 4e9de19

File tree

2 files changed

+19
-65
lines changed

2 files changed

+19
-65
lines changed

.github/workflows/pixi.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ jobs:
9595
run: |
9696
echo "****** df -h / -- pre build"
9797
df -h /
98-
pixi run build_noconfigure
98+
pixi run --skip-deps build
9999
echo "****** df -h / -- post build"
100100
df -h /
101101
find build -type f -name "*.o" -delete
@@ -104,7 +104,7 @@ jobs:
104104
df -h /
105105
106106
- name: Test
107-
run: pixi run test_nobuild
107+
run: pixi run --skip-deps test
108108

109109
- name: Disk space reporting AFTER (optimize free-disk-space)
110110
run: |

pyproject.toml

Lines changed: 17 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -40,22 +40,16 @@ cmd = '''cmake
4040
description = "Configure ITK"
4141
outputs = ["build/CMakeFiles/"]
4242

43-
[tool.pixi.feature.cxx.tasks.build_noconfigure]
44-
cmd = "cmake --build build"
45-
description = "Build ITK - post configure"
46-
outputs = ["build/lib/**"]
47-
4843
[tool.pixi.feature.cxx.tasks.build]
44+
cmd = "cmake --build build"
4945
description = "Build ITK"
50-
depends-on = ["configure", "build_noconfigure"]
51-
52-
[tool.pixi.feature.cxx.tasks.test_nobuild]
53-
cmd = "ctest -j3 --test-dir build"
54-
description = "Test ITK - post build"
46+
outputs = ["build/lib/**"]
47+
depends-on = ["configure"]
5548

5649
[tool.pixi.feature.cxx.tasks.test]
50+
cmd = "ctest -j3 --test-dir build"
5751
description = "Test ITK"
58-
depends-on = ["build", "test_nobuild"]
52+
depends-on = ["build"]
5953

6054
[tool.pixi.feature.cxx.tasks.configure-debug]
6155
cmd = '''cmake
@@ -67,26 +61,16 @@ cmd = '''cmake
6761
description = "Configure ITK - Debug"
6862
outputs = ["build-debug/CMakeFiles/"]
6963

70-
[tool.pixi.feature.cxx.tasks.build-debug_noconfigure]
71-
cmd = "cmake --build build-debug"
72-
description = "Build ITK - Debug"
73-
outputs = ["build-debug/lib/**"]
74-
depends-on = []
75-
7664
[tool.pixi.feature.cxx.tasks.build-debug]
7765
cmd = "cmake --build build-debug"
7866
description = "Build ITK - Debug"
79-
depends-on = ["configure-debug","build-debug_noconfigure"]
80-
81-
[tool.pixi.feature.cxx.tasks.test-debug_nobuild]
82-
cmd = "ctest -j3 --test-dir build-debug"
83-
description = "Test ITK - Debug"
84-
depends-on = []
67+
outputs = ["build-debug/lib/**"]
68+
depends-on = ["configure-debug"]
8569

8670
[tool.pixi.feature.cxx.tasks.test-debug]
8771
cmd = "ctest -j3 --test-dir build-debug"
8872
description = "Test ITK - Debug"
89-
depends-on = ["build-debug","test-debug_nobuild"]
73+
depends-on = ["build-debug"]
9074

9175
[tool.pixi.feature.cxx.tasks.configure-release]
9276
cmd = '''cmake
@@ -98,26 +82,16 @@ cmd = '''cmake
9882
description = "Configure ITK - Release"
9983
outputs = ["build-release/CMakeFiles/"]
10084

101-
[tool.pixi.feature.cxx.tasks.build-release_noconfigure]
102-
cmd = "cmake --build build-release"
103-
description = "Build ITK - Release"
104-
outputs = ["build-release/lib/**"]
105-
depends-on = []
106-
10785
[tool.pixi.feature.cxx.tasks.build-release]
10886
cmd = "cmake --build build-release"
10987
description = "Build ITK - Release"
110-
depends-on = ["configure-release","build-release_noconfigure"]
111-
112-
[tool.pixi.feature.cxx.tasks.test-release_nobuild]
113-
cmd = "ctest -j3 --test-dir build-release"
114-
description = "Test ITK - Release"
115-
depends-on = []
88+
outputs = ["build-release/lib/**"]
89+
depends-on = ["configure-release"]
11690

11791
[tool.pixi.feature.cxx.tasks.test-release]
11892
cmd = "ctest -j3 --test-dir build-release"
11993
description = "Test ITK - Release"
120-
depends-on = ["build-release","test-release_nobuild"]
94+
depends-on = ["build-release"]
12195

12296
[tool.pixi.feature.python.tasks.configure-python]
12397
cmd = '''cmake
@@ -130,26 +104,16 @@ cmd = '''cmake
130104
description = "Configure ITK Python"
131105
outputs = ["build/CMakeFiles/"]
132106

133-
[tool.pixi.feature.python.tasks.build-python_noconfigure]
134-
cmd = "cmake --build build-python"
135-
description = "Build ITK Python"
136-
outputs = ["build/lib/**"]
137-
depends-on = []
138-
139107
[tool.pixi.feature.python.tasks.build-python]
140108
cmd = "cmake --build build-python"
141109
description = "Build ITK Python"
142-
depends-on = ["configure-python","build-python_noconfigure"]
143-
144-
[tool.pixi.feature.python.tasks.test-python_nobuild]
145-
cmd = "ctest -j3 --test-dir build-python"
146-
description = "Test ITK Python"
147-
depends-on = []
110+
outputs = ["build/lib/**"]
111+
depends-on = ["configure-python"]
148112

149113
[tool.pixi.feature.python.tasks.test-python]
150114
cmd = "ctest -j3 --test-dir build-python"
151115
description = "Test ITK Python"
152-
depends-on = ["build-python","test-python_nobuild"]
116+
depends-on = ["build-python"]
153117

154118
[tool.pixi.feature.python.tasks.python-exe]
155119
cmd = '''cp ./build-python/Wrapping/Generators/Python/WrapITK.pth $(python -c "import site; print(next(p for p in site.getsitepackages() if \'site-packages\' in p))") &&
@@ -168,26 +132,16 @@ cmd = '''cmake
168132
description = "Configure ITK Python - Debug"
169133
outputs = ["build-debug-python/CMakeFiles/"]
170134

171-
[tool.pixi.feature.python.tasks.build-debug-python_noconfigure]
172-
cmd = "cmake --build build-debug-python"
173-
description = "Build ITK Python - Debug"
174-
outputs = ["build-debug-python/lib/**"]
175-
depends-on = []
176-
177135
[tool.pixi.feature.python.tasks.build-debug-python]
178136
cmd = "cmake --build build-debug-python"
179137
description = "Build ITK Python - Debug"
180-
depends-on = ["configure-debug-python","build-debug-python_noconfigure"]
181-
182-
[tool.pixi.feature.python.tasks.test-debug-python_nobuild]
183-
cmd = "ctest -j3 --test-dir build-debug-python"
184-
description = "Test ITK Python - Debug"
185-
depends-on = []
138+
outputs = ["build-debug-python/lib/**"]
139+
depends-on = ["configure-debug-python"]
186140

187141
[tool.pixi.feature.python.tasks.test-debug-python]
188142
cmd = "ctest -j3 --test-dir build-debug-python"
189143
description = "Test ITK Python - Debug"
190-
depends-on = ["build-debug-python","test-debug-python_nobuild"]
144+
depends-on = ["build-debug-python"]
191145

192146
[tool.pixi.feature.python.tasks.python-exe-debug]
193147
cmd = '''cp ./build-python/Wrapping/Generators/Python/WrapITK.pth $(python -c "import site; print(next(p for p in site.getsitepackages() if \'site-packages\' in p))") &&

0 commit comments

Comments
 (0)