Following numba#1035 on updating pipeline files

modiking · Apr 24, 2024 · 7376017 · 7376017
1 parent 4a63bf8
commit 7376017
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -18,10 +18,10 @@ jobs:
         PYTHON: '3.12'
         CONDA_ENV: cienv
 
-      llvm15:
+      llvm17:
         PYTHON: '3.12'
         CONDA_ENV: cienv
-        LLVM: '15'
+        LLVM: '17'
 
 - template: buildscripts/azure/azure-linux-macos.yml
   parameters:
@@ -72,10 +72,10 @@ jobs:
         CONDA_ENV: cienv
         BUILD_DOCS: 'yes'
 
-      llvm15:
+      llvm17:
         PYTHON: '3.12'
         CONDA_ENV: cienv
-        LLVM: '15'
+        LLVM: '17'
 
 - template: buildscripts/azure/azure-windows.yml
   parameters:

diff --git a/buildscripts/azure/azure-windows.yml b/buildscripts/azure/azure-windows.yml
@@ -22,10 +22,10 @@ jobs:
         PYTHON: '3.12'
         CONDA_ENV: cienv
 
-      llvm15:
+      llvm17:
         PYTHON: '3.12'
         CONDA_ENV: cienv
-        LLVM: '15'
+        LLVM: '17'
 
   steps:
 

diff --git a/buildscripts/incremental/build.cmd b/buildscripts/incremental/build.cmd
@@ -15,7 +15,7 @@ call activate %CONDA_ENV%
 @rem - https://github.com/conda-forge/llvmdev-feedstock/issues/175
 @rem - https://github.com/conda-forge/llvmdev-feedstock/pull/223
 @rem - https://github.com/MicrosoftDocs/visualstudio-docs/issues/7774
-if "%LLVM%"=="15" (
+if "%LLVM%"=="17" (
   call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\Common7\Tools\VsDevCmd.bat"
   if %errorlevel% neq 0 exit /b %errorlevel%
 )

diff --git a/buildscripts/incremental/setup_conda_environment.cmd b/buildscripts/incremental/setup_conda_environment.cmd
@@ -14,7 +14,7 @@ call activate %CONDA_ENV%
 if %errorlevel% neq 0 exit /b %errorlevel%
 
 @rem Install llvmdev
-if "%LLVM%"=="15" (
+if "%LLVM%"=="17" (
   set LLVMDEV_CHANNEL="conda-forge"
 ) else (
   set LLVMDEV_CHANNEL="numba/label/dev"

diff --git a/buildscripts/incremental/setup_conda_environment.sh b/buildscripts/incremental/setup_conda_environment.sh
@@ -27,8 +27,8 @@ source activate $CONDA_ENV
 set -v
 
 # Install llvmdev (separate channel, for now)
-if [ "$LLVM" == "15" ]; then
-    $CONDA_INSTALL -c conda-forge llvmdev="15"
+if [ "$LLVM" == "17" ]; then
+    $CONDA_INSTALL -c conda-forge llvmdev="17"
 else
     $CONDA_INSTALL -c numba/label/dev llvmdev="14.*"
 fi