From c926f3f6dc2785edb0b84fa3e0f73f48ef62602e Mon Sep 17 00:00:00 2001 From: John Kleinschmidt Date: Fri, 10 Aug 2018 14:16:23 -0400 Subject: [PATCH] Use vs2017-15.4.5 for AppVeyor Update to libcc with VS2017 15.4.5 --- DEPS | 2 +- appveyor.yml => appveyor-override.yml | 12 +++++------- vendor/libchromiumcontent | 2 +- 3 files changed, 7 insertions(+), 9 deletions(-) rename appveyor.yml => appveyor-override.yml (92%) diff --git a/DEPS b/DEPS index 3de2d30f46555..3d355d809b49d 100644 --- a/DEPS +++ b/DEPS @@ -2,7 +2,7 @@ vars = { 'chromium_version': '63.0.3239.150', 'libchromiumcontent_revision': - '1c542968990da951df27c8a0371a4ab5494a5a6c', + 'a81166ad79e68fbfe7cf5ba243192d6412e26b37', 'node_version': 'v9.7.0-33-g538a5023af', 'native_mate_revision': diff --git a/appveyor.yml b/appveyor-override.yml similarity index 92% rename from appveyor.yml rename to appveyor-override.yml index 60a97ce048a57..d0281e481f6a6 100644 --- a/appveyor.yml +++ b/appveyor-override.yml @@ -1,13 +1,11 @@ -version: 1.0.{build} -branches: - except: - - /^release$|^release-\d-\d-x$/ build_cloud: electron-16 -image: electron-16-vs2017 -environment: - DISABLE_CRASH_REPORTER_TESTS: true +image: electron-16-vs2017-15.4.5 build_script: - 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]) { Write-warning "Skipping PR build for branch"; Exit-AppveyorBuild } else { diff --git a/vendor/libchromiumcontent b/vendor/libchromiumcontent index 0106aa2d014dc..a81166ad79e68 160000 --- a/vendor/libchromiumcontent +++ b/vendor/libchromiumcontent @@ -1 +1 @@ -Subproject commit 0106aa2d014dc1cf1f08b1567b65f5af8992f99a +Subproject commit a81166ad79e68fbfe7cf5ba243192d6412e26b37