Skip to content

Commit 8a87e80

Browse files
authored
Update conda in Appveyor CI and move jobs from Appveyor to Azure (#3400)
* Fix clang/cl builds on Appveyor and move them to Azure * Add clang/flang and mingw builds on Windows to Azure
1 parent b54b50f commit 8a87e80

File tree

2 files changed

+56
-12
lines changed

2 files changed

+56
-12
lines changed

appveyor.yml

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,15 @@ environment:
2929
global:
3030
CONDA_INSTALL_LOCN: C:\\Miniconda36-x64
3131
matrix:
32-
- COMPILER: clang-cl
33-
WITH_FORTRAN: ON
34-
- COMPILER: clang-cl
35-
DYNAMIC_ARCH: ON
36-
WITH_FORTRAN: OFF
37-
- COMPILER: cl
38-
- COMPILER: MinGW64-gcc-7.2.0-mingw
39-
DYNAMIC_ARCH: OFF
40-
WITH_FORTRAN: ignore
32+
# - COMPILER: clang-cl
33+
# WITH_FORTRAN: ON
34+
# - COMPILER: clang-cl
35+
# DYNAMIC_ARCH: ON
36+
# WITH_FORTRAN: OFF
37+
# - COMPILER: cl
38+
# - COMPILER: MinGW64-gcc-7.2.0-mingw
39+
# DYNAMIC_ARCH: OFF
40+
# WITH_FORTRAN: ignore
4141
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
4242
COMPILER: MinGW-gcc-6.3.0-32
4343
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
@@ -46,6 +46,7 @@ environment:
4646

4747
install:
4848
- if [%COMPILER%]==[clang-cl] call %CONDA_INSTALL_LOCN%\Scripts\activate.bat
49+
- if [%COMPILER%]==[clang-cl] conda update --yes -n base conda
4950
- if [%COMPILER%]==[clang-cl] conda config --add channels conda-forge --force
5051
- if [%COMPILER%]==[clang-cl] conda config --set auto_update_conda false
5152
- if [%COMPILER%]==[clang-cl] conda install --yes --quiet clangdev cmake ninja flang=11.0.1
@@ -64,8 +65,8 @@ before_build:
6465
- if [%COMPILER%]==[MinGW64-gcc-7.2.0-mingw] cmake -G "MinGW Makefiles" -DNOFORTRAN=1 ..
6566
- if [%COMPILER%]==[MinGW-gcc-6.3.0-32] cmake -G "MSYS Makefiles" -DNOFORTRAN=1 ..
6667
- if [%COMPILER%]==[MinGW-gcc-5.3.0] cmake -G "MSYS Makefiles" -DNOFORTRAN=1 ..
67-
- if [%WITH_FORTRAN%]==[OFF] cmake -G "Ninja" -DCMAKE_CXX_COMPILER=clang-cl -DCMAKE_C_COMPILER=clang-cl -DMSVC_STATIC_CRT=ON ..
68-
- if [%WITH_FORTRAN%]==[ON] cmake -G "Ninja" -DCMAKE_CXX_COMPILER=clang-cl -DCMAKE_C_COMPILER=clang-cl -DCMAKE_Fortran_COMPILER=flang -DBUILD_WITHOUT_LAPACK=no -DNOFORTRAN=0 ..
68+
- if [%WITH_FORTRAN%]==[OFF] cmake -G "Ninja" -DCMAKE_CXX_COMPILER=clang-cl -DCMAKE_C_COMPILER=clang-cl -DCMAKE_MT=mt -DMSVC_STATIC_CRT=ON ..
69+
- if [%WITH_FORTRAN%]==[ON] cmake -G "Ninja" -DCMAKE_CXX_COMPILER=clang-cl -DCMAKE_C_COMPILER=clang-cl -DCMAKE_Fortran_COMPILER=flang -DCMAKE_MT=mt -DBUILD_WITHOUT_LAPACK=no -DNOFORTRAN=0 ..
6970
- if [%USE_OPENMP%]==[ON] cmake -DUSE_OPENMP=ON ..
7071
- if [%DYNAMIC_ARCH%]==[ON] cmake -DDYNAMIC_ARCH=ON -DDYNAMIC_LIST='CORE2;NEHALEM;SANDYBRIDGE;BULLDOZER;HASWELL' ..
7172

azure-pipelines.yml

Lines changed: 44 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,50 @@ jobs:
7575
cd utest
7676
dir
7777
openblas_utest.exe
78-
78+
79+
- job: Windows_mingw_gmake
80+
pool:
81+
vmImage: 'windows-latest'
82+
steps:
83+
- script: |
84+
mingw32-make CC=gcc FC=gfortran DYNAMIC_ARCH=1 DYNAMIC_LIST="NEHALEM SANDYBRIDGE HASWELL"
85+
86+
- job: Windows_clang_cmake
87+
pool:
88+
vmImage: 'windows-latest'
89+
steps:
90+
- script: |
91+
set "PATH=C:\Miniconda\Scripts;C:\Miniconda\Library\bin;C:\Miniconda\Library\usr\bin;C:\Miniconda\condabin;%PATH%"
92+
set "LIB=C:\Miniconda\Library\lib;%LIB%"
93+
set "CPATH=C:\Miniconda\Library\include;%CPATH%
94+
conda config --add channels conda-forge --force
95+
conda config --set auto_update_conda false
96+
conda install --yes ninja
97+
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
98+
mkdir build
99+
cd build
100+
cmake -G "Ninja" -DCMAKE_C_COMPILER=clang-cl -DCMAKE_CXX_COMPILER=clang-cl -DCMAKE_MT=mt -DCMAKE_BUILD_TYPE=Release -DNOFORTRAN=1 -DMSVC_STATIC_CRT=ON ..
101+
cmake --build . --config Release
102+
ctest
103+
104+
- job: Windows_flang_clang
105+
pool:
106+
vmImage: 'windows-latest'
107+
steps:
108+
- script: |
109+
set "PATH=C:\Miniconda\Scripts;C:\Miniconda\Library\bin;C:\Miniconda\Library\usr\bin;C:\Miniconda\condabin;%PATH%"
110+
set "LIB=C:\Miniconda\Library\lib;%LIB%"
111+
set "CPATH=C:\Miniconda\Library\include;%CPATH%"
112+
conda config --add channels conda-forge --force
113+
conda config --set auto_update_conda false
114+
conda install --yes --quiet ninja flang
115+
mkdir build
116+
cd build
117+
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
118+
cmake -G "Ninja" -DCMAKE_C_COMPILER=clang-cl -DCMAKE_CXX_COMPILER=clang-cl -DCMAKE_Fortran_COMPILER=flang -DCMAKE_MT=mt -DCMAKE_BUILD_TYPE=Release -DMSVC_STATIC_CRT=ON ..
119+
cmake --build . --config Release
120+
ctest
121+
79122
- job: OSX_OpenMP
80123
pool:
81124
vmImage: 'macOS-10.15'

0 commit comments

Comments
 (0)