Merge pull request #611 from k-dominik/fix-win-ci

hmaarrfk · web-flow · commit 35d7ded66c63 · 2025-08-06T09:52:13.000-04:00
Fix windows CI
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -44,7 +44,7 @@ jobs:
           bash ci/build_unix.sh
   - job: Windows
     pool:
-      vmImage: windows-2019
+      vmImage: windows-2022
     strategy:
       matrix:
         windows_py310:
diff --git a/ci/build_unix.sh b/ci/build_unix.sh
@@ -2,15 +2,15 @@ set -ex
 
 PYTHON_VERSION="${PYTHON_VERSION:-3.10}"
 
-conda config --add channels conda-forge
-conda config --remove channels defaults || true
 conda config --show
 conda create \
     --quiet --yes \
+    --override-channels \
+    -c conda-forge -c nodefaults \
     --name vigra \
     python=${PYTHON_VERSION} pytest c-compiler cxx-compiler \
     zlib libjpeg-turbo libpng libtiff hdf5 fftw \
-    boost boost-cpp numpy h5py sphinx \
+    libboost-python libboost-python-devel numpy h5py sphinx \
     openexr lemon cmake make ruff
 
 if [[ `uname` == 'Darwin' ]]; then
diff --git a/ci/build_windows.bat b/ci/build_windows.bat
@@ -2,19 +2,18 @@
 call conda info
 if errorlevel 1 exit 1
 
-call conda config --add channels conda-forge
-if errorlevel 1 exit 1
-call conda config --remove channels defaults || true
-if errorlevel 1 exit 1
 call conda config --show
 if errorlevel 1 exit 1
 
 call conda create ^
+    --override-channels ^
+    -c conda-forge ^
+    -c nodefaults ^
     --quiet --yes ^
     --name vigra ^
     python=%PYTHON_VERSION% pytest c-compiler cxx-compiler ^
     zlib libjpeg-turbo libpng libtiff hdf5 fftw cmake ninja ^
-    boost boost-cpp numpy h5py sphinx ^
+    libboost-python libboost-python-devel numpy h5py sphinx ^
     openexr lemon
 
 if errorlevel 1 exit 1
