EPICS Base

Merge ~info-martin-konrad/epics-base:explicitly-specify-appveyor-worker-image into ~epics-core/epics-base/+git/epics-base:3.15

  1. Git
  2. lp:~info-martin-konrad/epics-base
  3. explicitly-specify-appveyor-worker-image
  4. Merge into 3.15
Proposed by Martin Konrad
Status: Merged
Approved by: Andrew Johnson
Approved revision: 2aecf3142a23a273d346a9289431f0d8a5f275fd
Merged at revision: bdf01e7a67c45d72228b6c19139b9b3c9e65fe73
Proposed branch: ~info-martin-konrad/epics-base:explicitly-specify-appveyor-worker-image
Merge into: ~epics-core/epics-base/+git/epics-base:3.15
Diff against target: 29 lines (+10/-6)
1 file modified
appveyor.yml (+10/-6)
Reviewer Review Type Date Requested Status
Andrew Johnson Approve
mdavidsaver Pending
Review via email: mp+382142@code.launchpad.net

Description of the change

AppVeyor kept using "Visual Studio 2019" if not specified explicitly although the documentation says it should default to "Visual Studio 2015". Specifying the worker image explicitly fixes these problems.

To post a comment you must log in.
Revision history for this message
Andrew Johnson (anj) wrote :

No objections; I haven't tested this myself though.

Revision history for this message
Martin Konrad (info-martin-konrad) wrote :

With this change the build succeeds: https://ci.appveyor.com/project/MartinKonrad/epics-base/builds/32153795

Revision history for this message
Andrew Johnson (anj) wrote :

Merging.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/appveyor.yml b/appveyor.yml
2index ff829f8..bc04839 100644
3--- a/appveyor.yml
4+++ b/appveyor.yml
5@@ -40,14 +40,18 @@ configuration:
6 # Environment variables: compiler toolchain
7 environment:
8 matrix:
9- - TOOLCHAIN: 10.0
10- - TOOLCHAIN: 11.0
11- - TOOLCHAIN: 12.0
12- - TOOLCHAIN: 14.0
13+ - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
14+ TOOLCHAIN: 10.0
15+ - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
16+ TOOLCHAIN: 11.0
17+ - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
18+ TOOLCHAIN: 12.0
19+ - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
20+ TOOLCHAIN: 14.0
21 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
22 TOOLCHAIN: 2017
23- - TOOLCHAIN: mingw
24- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
25+ - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
26+ TOOLCHAIN: mingw
27
28 # Platform: architecture
29 platform:

Subscribers

People subscribed via source and target branches