Skip to content

Commit b3f07a5

Browse files
committed
Prepare full-tier Python dependencies before concurrent builds
1 parent 835ca8a commit b3f07a5

1 file changed

Lines changed: 7 additions & 7 deletions

File tree

‎ci/run.sh‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,13 @@ fast)
115115
;;
116116
full)
117117
python_env || exit
118+
# Enable the unchanged collisional wall test in the merge-queue slow set.
119+
# CGAL's release archive is supplied offline by ci/bundle.sh.
120+
mkdir -p "$root/cgal" &&
121+
tar -xf "$root/data/CGAL-6.0.1.tar.xz" -C "$root/cgal" --strip-components=1 || exit
122+
python -m pip install -q 'numpy==2.2.6' 'scipy==1.16.3' vtk \
123+
'git+https://github.com/itpplasma/map2disc.git@14da2f094ab2505a639b9cd04af57f5c0dbfaa54' || exit
124+
make_args+=("FLAGS=-DSIMPLE_ENABLE_CGAL=ON -DFETCHCONTENT_SOURCE_DIR_CGAL=$root/cgal")
118125
# Second tree for the regression build (it needs its own build/ and a
119126
# different libneo); started first because it holds the critical path.
120127
cp -a "$src" "$root/src-reg"
@@ -124,13 +131,6 @@ full)
124131
(cd "$root/src-reg" && regression_suite "$jb" "$tb") > "$root/regression.log" 2>&1 &
125132
reg_pid=$!
126133
stamp "regression started in background (log follows at the end)"
127-
# Enable the unchanged collisional wall test in the merge-queue slow set.
128-
# CGAL's release archive is supplied offline by ci/bundle.sh.
129-
mkdir -p "$root/cgal" &&
130-
tar -xf "$root/data/CGAL-6.0.1.tar.xz" -C "$root/cgal" --strip-components=1 || exit
131-
python -m pip install -q 'numpy==2.2.6' 'scipy==1.16.3' vtk \
132-
'git+https://github.com/itpplasma/map2disc.git@14da2f094ab2505a639b9cd04af57f5c0dbfaa54' || exit
133-
make_args+=("FLAGS=-DSIMPLE_ENABLE_CGAL=ON -DFETCHCONTENT_SOURCE_DIR_CGAL=$root/cgal")
134134
fast_suite "$ja" && stamp "test-slow (ctest -j$ja)" &&
135135
(cd build && ctest --test-dir test -N -L slow -R '^test_collisional_stl_wall$' |
136136
grep 'Test.*test_collisional_stl_wall$') && make test-slow

0 commit comments

Comments
 (0)