Skip to content

Commit 1644227

Browse files
committed
ci: Remove steps with same arguments and try to use cl compiler on windows-latest
1 parent 3141a95 commit 1644227

File tree

1 file changed

+9
-42
lines changed

1 file changed

+9
-42
lines changed

.github/workflows/ci-linux-osx-win-conda.yml

Lines changed: 9 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,14 @@ jobs:
2626
os: macos-latest
2727
- name: macos-14
2828
os: macos-14
29+
# proxsuite doesn't build with vs2019, so we use clang-cl instead
2930
- name: windows-2019-clang-cl
3031
os: windows-2019
3132
compiler: clang-cl
33+
# proxsuite should work with vs2022
3234
- name: windows-latest
3335
os: windows-latest
36+
compiler: cl
3437
- name: macos-latest
3538
os: macos-latest
3639
build_type: Debug
@@ -95,7 +98,7 @@ jobs:
9598
env
9699
97100
- name: Configure [Conda/Linux&macOS]
98-
if: contains(matrix.os, 'macos-latest') || contains(matrix.os, 'ubuntu')
101+
if: contains(matrix.os, 'macos-') || contains(matrix.os, 'ubuntu')
99102
shell: bash -l {0}
100103
run: |
101104
echo $(whereis ccache)
@@ -105,18 +108,6 @@ jobs:
105108
cd build
106109
cmake .. -GNinja -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_STANDARD=${{ matrix.cxx_std }} -DCMAKE_INSTALL_PREFIX=${CONDA_PREFIX} -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -DBUILD_PYTHON_INTERFACE:BOOL=ON -DPYTHON_EXECUTABLE=$(which python3) -DBUILD_DOCUMENTATION:BOOL=ON -DINSTALL_DOCUMENTATION:BOOL=ON -DTEST_JULIA_INTERFACE:BOOL=OFF -DOpenMP_ROOT=$CONDA_PREFIX
107110
108-
- name: Configure [Conda/macOS14]
109-
if: contains(matrix.os, 'macos-14')
110-
shell: bash -l {0}
111-
run: |
112-
echo $(whereis ccache)
113-
echo $(which ccache)
114-
git submodule update --init
115-
mkdir build
116-
cd build
117-
cmake .. -GNinja -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_STANDARD=${{ matrix.cxx_std }} -DCMAKE_INSTALL_PREFIX=${CONDA_PREFIX} -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -DBUILD_PYTHON_INTERFACE:BOOL=ON -DPYTHON_EXECUTABLE=$(which python3) -DBUILD_DOCUMENTATION:BOOL=ON -DINSTALL_DOCUMENTATION:BOOL=ON -DTEST_JULIA_INTERFACE:BOOL=OFF -DOpenMP_ROOT=$CONDA_PREFIX
118-
119-
120111
- name: Configure [Conda/macOS-debug/CheckMalloc]
121112
if: contains(matrix.os, 'macos-latest') && contains(matrix.build_type, 'Debug')
122113
shell: bash -l {0}
@@ -126,41 +117,17 @@ jobs:
126117
cd build
127118
cmake .. -GNinja -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCHECK_RUNTIME_MALLOC:BOOL=ON -DCMAKE_CXX_STANDARD=${{ matrix.cxx_std }} -DCMAKE_INSTALL_PREFIX=${CONDA_PREFIX} -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -DBUILD_PYTHON_INTERFACE:BOOL=ON -DPYTHON_EXECUTABLE=$(which python3) -DBUILD_DOCUMENTATION:BOOL=ON -DINSTALL_DOCUMENTATION:BOOL=ON -DTEST_JULIA_INTERFACE:BOOL=OFF -DBUILD_WITH_OPENMP_SUPPORT:BOOL=ON -DOpenMP_ROOT=$CONDA_PREFIX
128119
129-
- name: Configure [Conda/Windows-2019]
130-
if: contains(matrix.os, 'windows-2019')
131-
shell: bash -l {0}
132-
run: |
133-
echo $(where ccache)
134-
git submodule update --init
135-
mkdir build
136-
cd build
137-
export CXX=clang-cl
138-
export CC=clang-cl
139-
cmake .. -G"Ninja" -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_INSTALL_PREFIX=${CONDA_PREFIX}/Library -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -DCMAKE_CXX_STANDARD=${{ matrix.cxx_std }} -DBUILD_PYTHON_INTERFACE:BOOL=ON -DPYTHON_SITELIB=${CONDA_PREFIX}/Lib/site-packages -DPYTHON_EXECUTABLE=${CONDA_PREFIX}/python.exe -DOpenMP_ROOT=$CONDA_PREFIX -DBUILD_WITH_OPENMP_SUPPORT:BOOL=ON -DLINK_PYTHON_INTERFACE_TO_OPENMP:BOOL=ON -DBUILD_DOCUMENTATION:BOOL=ON -DINSTALL_DOCUMENTATION:BOOL=ON
140-
141-
- name: Configure [Conda/Windows-latest]
142-
if: contains(matrix.os, 'windows-latest') && contains(matrix.cxx_std, '20')
143-
shell: bash -l {0}
144-
run: |
145-
echo $(where ccache)
146-
git submodule update --init
147-
mkdir build
148-
cd build
149-
export CXX=clang-cl
150-
export CC=clang-cl
151-
cmake .. -G"Ninja" -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_INSTALL_PREFIX=${CONDA_PREFIX}/Library -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -DCMAKE_CXX_STANDARD=${{ matrix.cxx_std }} -DBUILD_PYTHON_INTERFACE:BOOL=ON -DPYTHON_SITELIB=${CONDA_PREFIX}/Lib/site-packages -DPYTHON_EXECUTABLE=${CONDA_PREFIX}/python.exe -DOpenMP_ROOT=$CONDA_PREFIX -DBUILD_WITH_OPENMP_SUPPORT:BOOL=ON -DLINK_PYTHON_INTERFACE_TO_OPENMP:BOOL=ON -DBUILD_DOCUMENTATION:BOOL=ON -DINSTALL_DOCUMENTATION:BOOL=ON
152-
153-
- name: Configure [Conda/Windows-latest]
154-
if: contains(matrix.os, 'windows-latest') && contains(matrix.cxx_std, '17')
120+
- name: Configure [Conda/Windows]
121+
if: contains(matrix.os, 'windows-')
155122
shell: bash -l {0}
156123
run: |
157124
echo $(where ccache)
158125
git submodule update --init
159126
mkdir build
160127
cd build
161-
export CXX=clang-cl
162-
export CC=clang-cl
163-
cmake .. -G"Ninja" -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_INSTALL_PREFIX=${CONDA_PREFIX}/Library -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -DCMAKE_CXX_STANDARD=${{ matrix.cxx_std }} -DBUILD_PYTHON_INTERFACE:BOOL=ON -DPYTHON_SITELIB=${CONDA_PREFIX}/Lib/site-packages -DPYTHON_EXECUTABLE=${CONDA_PREFIX}/python.exe -DOpenMP_ROOT=$CONDA_PREFIX -DBUILD_WITH_OPENMP_SUPPORT:BOOL=ON -DLINK_PYTHON_INTERFACE_TO_OPENMP:BOOL=ON -DBUILD_DOCUMENTATION:BOOL=ON -DINSTALL_DOCUMENTATION:BOOL=ON
128+
export CC=${{ matrix.compiler }}
129+
export CXX=${{ matrix.compiler }}
130+
cmake .. -GNinja -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_INSTALL_PREFIX=${CONDA_PREFIX}/Library -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -DCMAKE_CXX_STANDARD=${{ matrix.cxx_std }} -DBUILD_PYTHON_INTERFACE:BOOL=ON -DPYTHON_SITELIB=${CONDA_PREFIX}/Lib/site-packages -DPYTHON_EXECUTABLE=${CONDA_PREFIX}/python.exe -DOpenMP_ROOT=$CONDA_PREFIX -DBUILD_WITH_OPENMP_SUPPORT:BOOL=ON -DLINK_PYTHON_INTERFACE_TO_OPENMP:BOOL=ON -DBUILD_DOCUMENTATION:BOOL=ON -DINSTALL_DOCUMENTATION:BOOL=ON
164131
165132
- name: Build [Conda]
166133
shell: bash -l {0}

0 commit comments

Comments
 (0)