Merge ~info-martin-konrad/epics-base:explicitly-specify-appveyor-worker-image into ~epics-core/epics-base/+git/epics-base: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 :
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
diff --git a/appveyor.yml b/appveyor.yml
index ff829f8..bc04839 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -40,14 +40,18 @@ configuration:
40# Environment variables: compiler toolchain40# Environment variables: compiler toolchain
41environment:41environment:
42 matrix:42 matrix:
43 - TOOLCHAIN: 10.043 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
44 - TOOLCHAIN: 11.044 TOOLCHAIN: 10.0
45 - TOOLCHAIN: 12.045 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
46 - TOOLCHAIN: 14.046 TOOLCHAIN: 11.0
47 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
48 TOOLCHAIN: 12.0
49 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
50 TOOLCHAIN: 14.0
47 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 201751 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
48 TOOLCHAIN: 201752 TOOLCHAIN: 2017
49 - TOOLCHAIN: mingw53 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
50 APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 201554 TOOLCHAIN: mingw
5155
52# Platform: architecture56# Platform: architecture
53platform:57platform:

Subscribers

People subscribed via source and target branches