From 7376017c01a898472da2851e3f964447ce4d94f9 Mon Sep 17 00:00:00 2001 From: modimo Date: Wed, 24 Apr 2024 11:17:04 -0700 Subject: [PATCH] Following https://github.com/numba/llvmlite/pull/1035/ on updating pipeline files --- azure-pipelines.yml | 8 ++++---- buildscripts/azure/azure-windows.yml | 4 ++-- buildscripts/incremental/build.cmd | 2 +- buildscripts/incremental/setup_conda_environment.cmd | 2 +- buildscripts/incremental/setup_conda_environment.sh | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 160354317..d26c010b6 100644 --- 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 index fd61bb7a8..bdeb88655 100644 --- 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 index 182cdde8f..e5f79d589 100644 --- 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 index afd47c5f2..b2e2f2257 100644 --- 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 index 7dd431848..57e171d31 100755 --- 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