mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge pull request #14022 from electron/3-0-x-vs2017-15-4-5

Browse source 
ci: Use vs2017-15.4.5 for 3-0-x on AppVeyor
This commit is contained in:
John Kleinschmidt 2018-08-10 17:18:21 -04:00 committed by GitHub
commit fb2afe8656
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
DEPS
View file

@ -2,7 +2,7 @@ vars = {
'chromium_version': 'chromium_version':
'63.0.3239.150', '63.0.3239.150',
'libchromiumcontent_revision': 'libchromiumcontent_revision':
'1c542968990da951df27c8a0371a4ab5494a5a6c', 'a81166ad79e68fbfe7cf5ba243192d6412e26b37',
'node_version': 'node_version':
'v9.7.0-33-g538a5023af', 'v9.7.0-33-g538a5023af',
'native_mate_revision': 'native_mate_revision':

12
appveyor.yml → appveyor-override.yml
View file

@ -1,13 +1,11 @@
version: 1.0.{build}
branches:
except:
- /^release$|^release-\d-\d-x$/
build_cloud: electron-16 build_cloud: electron-16
image: electron-16-vs2017 image: electron-16-vs2017-15.4.5
environment:
DISABLE_CRASH_REPORTER_TESTS: true
build_script: build_script:
- ps: >- - ps: >-
echo "Build worker image $env:APPVEYOR_BUILD_WORKER_IMAGE"
&"C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe"
if(($env:APPVEYOR_PULL_REQUEST_HEAD_REPO_NAME -split "/")[0] -eq ($env:APPVEYOR_REPO_NAME -split "/")[0]) { if(($env:APPVEYOR_PULL_REQUEST_HEAD_REPO_NAME -split "/")[0] -eq ($env:APPVEYOR_REPO_NAME -split "/")[0]) {
Write-warning "Skipping PR build for branch"; Exit-AppveyorBuild Write-warning "Skipping PR build for branch"; Exit-AppveyorBuild
} else { } else {

2
vendor/libchromiumcontent vendored

@ -1 +1 @@
Subproject commit 0106aa2d014dc1cf1f08b1567b65f5af8992f99a Subproject commit a81166ad79e68fbfe7cf5ba243192d6412e26b37