From 52cdfe0a440258307540d2d37f35e5c09bf3cba5 Mon Sep 17 00:00:00 2001 From: Ralph Lange Date: Fri, 3 May 2019 15:34:01 +0200 Subject: [PATCH] appveyor-ci: use pre-installed AppVeyor MinGW --- .appveyor.yml | 1 + .ci/appveyor-make.bat | 8 ++++---- .ci/appveyor-prepare.bat | 7 ------- 3 files changed, 5 insertions(+), 11 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index bc07969fe..2cdc51128 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -48,6 +48,7 @@ environment: TOOLCHAIN: 2017 - TOOLCHAIN: cygwin - TOOLCHAIN: mingw + APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 # Platform: architecture platform: diff --git a/.ci/appveyor-make.bat b/.ci/appveyor-make.bat index a489d80ee..9cd8fe684 100644 --- a/.ci/appveyor-make.bat +++ b/.ci/appveyor-make.bat @@ -42,13 +42,13 @@ if "%TOOLCHAIN%"=="mingw" ( set "MAKE=mingw32-make" if "%OS%"=="64BIT" ( set "EPICS_HOST_ARCH=windows-x64-mingw" - set "INCLUDE=C:\tools\mingw64\include;%INCLUDE%" - set "PATH=C:\tools\mingw64\bin;%PATH%" + set "INCLUDE=C:\mingw-w64\x86_64-8.1.0-posix-seh-rt_v6-rev0\mingw64\include;%INCLUDE%" + set "PATH=C:\mingw-w64\x86_64-8.1.0-posix-seh-rt_v6-rev0\mingw64\bin;%PATH%" echo [INFO] MinGW Toolchain 64bit ) else ( set "EPICS_HOST_ARCH=win32-x86-mingw" - set "INCLUDE=C:\tools\mingw32\include;%INCLUDE%" - set "PATH=C:\tools\mingw32\bin;%PATH%" + set "INCLUDE=C:\mingw-w64\i686-6.3.0-posix-dwarf-rt_v5-rev1\mingw32\include;%INCLUDE%" + set "PATH=C:\mingw-w64\i686-6.3.0-posix-dwarf-rt_v5-rev1\mingw32\bin;%PATH%" echo [INFO] MinGW Toolchain 32bit ) echo [INFO] Compiler Version diff --git a/.ci/appveyor-prepare.bat b/.ci/appveyor-prepare.bat index c1d0e5d9a..9e116354a 100644 --- a/.ci/appveyor-prepare.bat +++ b/.ci/appveyor-prepare.bat @@ -55,13 +55,6 @@ if "%TOOLCHAIN%"=="mingw" ( ) || ( echo [INFO] EPICS set up for optimized build ) - if "%OS%"=="64BIT" ( - echo [INFO] Installing MinGW 64bit - cinst mingw --version="5.3.0" || cinst mingw --version="5.3.0" - ) else ( - echo [INFO] Installing MinGW 32bit - cinst mingw --x86 --version="5.3.0" || cinst mingw --x86 --version="5.3.0" - ) ) echo [INFO] Installing Make 4.1