Skip to content

Build Windows with MSVC 2019 #44

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
aminya merged 4 commits into from
Aug 24, 2020
Merged

Build Windows with MSVC 2019 #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e1b3004
ci: use windows-2019 image
aminya Aug 21, 2020
95bf018
windows-build-tools 5
aminya Aug 23, 2020
9b03967
CI preparation.yml: No windows-build-tools
DeeDeeG Aug 24, 2020
0af3325
ci: use windows-2019 image + test on windows-2016
aminya Aug 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion script/vsts/nightly-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:

dependsOn:
- GetReleaseVersion
- Windows_RendererTests
- Windows_Tests
- Linux
- macOS_tests

Expand Down
5 changes: 0 additions & 5 deletions script/vsts/platforms/templates/preparation.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,6 @@ steps:
displayName: Install npm 6.14.8
condition: eq(variables['Agent.OS'], 'Windows_NT')

- script: |
npm install --global --production [email protected]
displayName: Install windows build tools
condition: eq(variables['Agent.OS'], 'Windows_NT')

- script: |
cd script\vsts
npm install
Expand Down
15 changes: 11 additions & 4 deletions script/vsts/platforms/windows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
RunCoreMainTests: true

pool:
vmImage: vs2017-win2016
vmImage: windows-2019

variables:
AppName: $[ dependencies.GetReleaseVersion.outputs['Version.AppName'] ]
Expand Down Expand Up @@ -71,7 +71,7 @@ jobs:
dir: $(Build.SourcesDirectory)/out
condition: and(succeeded(), eq(variables['IsReleaseBranch'], 'true'))

- job: Windows_RendererTests
- job: Windows_Tests
displayName: Windows
dependsOn: Windows_build
timeoutInMinutes: 180
Expand All @@ -82,13 +82,20 @@ jobs:
RunCoreMainTests: false
RunCoreRendererTests: 1
buildArch: x64
os: windows-2019
x64_Renderer_Test2:
RunCoreMainTests: false
RunCoreRendererTests: 2
buildArch: x64
os: windows-2019
2016_Main_Test:
RunCoreMainTests: true
RunCoreRendererTests: false
buildArch: x64
os: vs2017-win2016

pool:
vmImage: vs2017-win2016
vmImage: $(os)

variables:
AppName: $[ dependencies.GetReleaseVersion.outputs['Version.AppName'] ]
Expand Down Expand Up @@ -120,5 +127,5 @@ jobs:
artifacts:
- atom$(FileID)-windows.zip

# Core renderer tests
# tests
- template: templates/test.yml
2 changes: 1 addition & 1 deletion script/vsts/release-branch-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:

dependsOn:
- GetReleaseVersion
- Windows_RendererTests
- Windows_Tests
- Linux
- macOS_tests

Expand Down