Skip to content

Commit 1103e33

Browse files
committedNov 16, 2020
8256354: Github Action build on Windows should define OS and MSVC versions
Reviewed-by: erikj, shade
1 parent 588caab commit 1103e33

File tree

1 file changed

+9
-2
lines changed

1 file changed

+9
-2
lines changed
 

‎.github/workflows/submit.yml

+9-2
Original file line numberDiff line numberDiff line change
@@ -1227,7 +1227,7 @@ jobs:
12271227

12281228
windows_x64_build:
12291229
name: Windows x64
1230-
runs-on: "windows-latest"
1230+
runs-on: "windows-2019"
12311231
needs: prerequisites
12321232
if: needs.prerequisites.outputs.should_run != 'false' && needs.prerequisites.outputs.platform_windows_x64 != 'false'
12331233

@@ -1307,12 +1307,19 @@ jobs:
13071307
path: ~/jtreg/
13081308
if: steps.jtreg_restore.outcome == 'failure'
13091309

1310+
- name: Ensure a specific version of MSVC is installed
1311+
run: >
1312+
Start-Process -FilePath 'C:\Program Files (x86)\Microsoft Visual Studio\Installer\vs_installer.exe' -Wait -NoNewWindow -ArgumentList
1313+
'modify --installPath "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise" --quiet
1314+
--add Microsoft.VisualStudio.Component.VC.14.27.x86.x64'
1315+
13101316
- name: Configure
13111317
run: >
13121318
$env:Path = "$HOME\cygwin\cygwin64\bin;$HOME\cygwin\cygwin64\bin;$env:Path" ;
13131319
$env:Path = $env:Path -split ";" -match "C:\\Windows|PowerShell|cygwin" -join ";" ;
13141320
& bash configure
13151321
--with-conf-name=windows-x64
1322+
--with-msvc-toolset-version=14.27
13161323
${{ matrix.flags }}
13171324
--with-version-opt="$env:GITHUB_ACTOR-$env:GITHUB_SHA"
13181325
--with-version-build=0
@@ -1342,7 +1349,7 @@ jobs:
13421349

13431350
windows_x64_test:
13441351
name: Windows x64
1345-
runs-on: "windows-latest"
1352+
runs-on: "windows-2019"
13461353
needs:
13471354
- prerequisites
13481355
- windows_x64_build

0 commit comments

Comments
 (0)
Please sign in to comment.