Skip to content

Commit 0474d1d

Browse files
committed
Fix integration configuration
1 parent 1c57ae3 commit 0474d1d

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

.github/workflows/integrate.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,12 @@ jobs:
6969
- name: windows-2016-msvc2017
7070
os: windows-2016
7171
compiler: cl
72+
version: "Visual Studio 15 2017 Win64"
7273

7374
- name: windows-2019-msvc2019
7475
os: windows-2019
7576
compiler: cl
77+
version: "Visual Studio 16 2019"
7678

7779
- name: macOS-10.15-xcode-11
7880
os: macOS-10.15
@@ -136,7 +138,6 @@ jobs:
136138
- name: Dependencies (Windows)
137139
if: runner.os == 'Windows'
138140
run: |
139-
choco install ninja --global
140141
if ( "${{matrix.compiler}}" -eq "gcc" ) {
141142
choco install gcc --global
142143
echo "CC=gcc" >> $Env:GITHUB_ENV
@@ -147,7 +148,6 @@ jobs:
147148
echo "CC=clang" >> $Env:GITHUB_ENV
148149
echo "CXX=clang++" >> $Env:GITHUB_ENV
149150
}
150-
echo "PATH=$Env:PATH" >> $Env:GITHUB_ENV
151151
152152
- name: Create Build Environment
153153
run: cmake -E make_directory ${{runner.workspace}}/build
@@ -160,7 +160,7 @@ jobs:
160160
- name: Configure CMake (Windows)
161161
if: runner.os == 'Windows'
162162
working-directory: ${{runner.workspace}}/build
163-
run: cmake $Env:GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=${{matrix.config}}
163+
run: cmake $Env:GITHUB_WORKSPACE -G"${{matrix.version}}" -DCMAKE_BUILD_TYPE=${{matrix.config}}
164164

165165
- name: Build
166166
working-directory: ${{runner.workspace}}/build

0 commit comments

Comments
 (0)