Skip to content

Commit a383d12

Browse files
committed
ci: Use VS2022 on Windows-latest
1 parent 563b56a commit a383d12

File tree

2 files changed

+29
-13
lines changed

2 files changed

+29
-13
lines changed

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

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -62,21 +62,17 @@ jobs:
6262

6363
- uses: conda-incubator/setup-miniconda@v3
6464
with:
65-
miniforge-version: latest
6665
activate-environment: proxsuite
67-
channels: conda-forge
68-
conda-remove-defaults: "true"
66+
environment-file: .github/workflows/conda/environment.yml
67+
auto-activate-base: false
68+
auto-update-conda: true
6969

70-
71-
- name: Install dependencies [Conda]
70+
- name: Install dependencies [Conda/Windows-latest]
71+
if: contains(matrix.os, 'windows-latest')
7272
shell: bash -l {0}
7373
run: |
74-
# Compilation related dependencies
75-
conda install cmake compilers make pkg-config doxygen ninja graphviz typing_extensions llvm-openmp clang
76-
# Main dependencies
77-
conda install eigen simde
78-
# Test dependencies
79-
conda install libmatio numpy scipy
74+
# Use VS2022 on Windows-latest
75+
conda install vs2022_win-64
8076
8177
- name: Install julia [Linux]
8278
if: contains(matrix.os, 'ubuntu')
@@ -119,7 +115,7 @@ jobs:
119115
120116
- name: Configure [Conda/Windows]
121117
if: contains(matrix.os, 'windows-')
122-
# It's better to use CMD to have all MSVC variables setup
118+
# It's better to use CMD to have all VS variables setup
123119
shell: cmd /C CALL {0}
124120
run: |
125121
git submodule update --init
@@ -138,7 +134,7 @@ jobs:
138134
139135
- name: Build [Conda/Windows]
140136
if: contains(matrix.os, 'windows-')
141-
# It's better to use CMD to have all MSVC variables setup
137+
# It's better to use CMD to have all VS variables setup
142138
shell: cmd /C CALL {0}
143139
run: |
144140
cd build
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
name: proxsuite
2+
channels:
3+
- conda-forge
4+
- nodefaults
5+
dependencies:
6+
- cmake
7+
- compilers
8+
- make
9+
- pkg-config
10+
- doxygen
11+
- ninja
12+
- graphviz
13+
- typing_extensions
14+
- llvm-openmp
15+
- clang
16+
- eigen
17+
- simde
18+
- libmatio
19+
- numpy
20+
- scipy

0 commit comments

Comments
 (0)