From afb02e36594e2f7cf0bc5efa859c2ebf6f027e1c Mon Sep 17 00:00:00 2001 From: Andrey Semashev Date: Sun, 9 Dec 2018 11:15:13 +0300 Subject: [PATCH] Grouped multiple jobs by cxxstd, added MinGW-w64 gcc 7 and 32-bit MinGW-w64 jobs. --- appveyor.yml | 60 +++++++++------------------------------------------- 1 file changed, 10 insertions(+), 50 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index d5a2b72..ec342f1 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -34,33 +34,18 @@ environment: APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 - TOOLSET: gcc ADDRESS_MODEL: 64 - B2_ARGS: cxxflags=-std=c++03 + CXXSTD: 03,11,03-gnu,11-gnu ADDPATH: C:\cygwin64\bin APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 - TOOLSET: gcc ADDRESS_MODEL: 64 - B2_ARGS: cxxflags=-std=c++11 - ADDPATH: C:\cygwin64\bin - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 - - TOOLSET: gcc - ADDRESS_MODEL: 64 - B2_ARGS: cxxflags=-std=c++03 + CXXSTD: 03,11,14,03-gnu,11-gnu,14-gnu ADDPATH: C:\mingw-w64\x86_64-6.3.0-posix-seh-rt_v5-rev1\mingw64\bin APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 - TOOLSET: gcc ADDRESS_MODEL: 64 - B2_ARGS: cxxflags=-std=c++11 - ADDPATH: C:\mingw-w64\x86_64-6.3.0-posix-seh-rt_v5-rev1\mingw64\bin - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 - - TOOLSET: gcc - ADDRESS_MODEL: 64 - B2_ARGS: cxxflags=-std=gnu++03 - ADDPATH: C:\mingw-w64\x86_64-6.3.0-posix-seh-rt_v5-rev1\mingw64\bin - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 - - TOOLSET: gcc - ADDRESS_MODEL: 64 - B2_ARGS: cxxflags=-std=gnu++11 - ADDPATH: C:\mingw-w64\x86_64-6.3.0-posix-seh-rt_v5-rev1\mingw64\bin + CXXSTD: 03,11,14,17,03-gnu,11-gnu,14-gnu,17-gnu + ADDPATH: C:\mingw-w64\x86_64-7.3.0-posix-seh-rt_v5-rev0\mingw64\bin APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 - TOOLSET: msvc-9.0 @@ -83,45 +68,19 @@ environment: APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 - TOOLSET: gcc ADDRESS_MODEL: 32 - B2_ARGS: cxxflags=-std=c++03 + CXXSTD: 03,11,03-gnu,11-gnu ADDPATH: C:\cygwin\bin APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 - TOOLSET: gcc ADDRESS_MODEL: 32 - B2_ARGS: cxxflags=-std=c++11 - ADDPATH: C:\cygwin\bin - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 - - TOOLSET: gcc - ADDRESS_MODEL: 32 - B2_ARGS: cxxflags=-std=c++03 + CXXSTD: 03,11,03-gnu,11-gnu ADDPATH: C:\mingw\bin APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 - TOOLSET: gcc ADDRESS_MODEL: 32 - B2_ARGS: cxxflags=-std=c++11 - ADDPATH: C:\mingw\bin + CXXSTD: 03,11,14,03-gnu,11-gnu,14-gnu + ADDPATH: C:\mingw-w64\i686-6.3.0-posix-dwarf-rt_v5-rev1\mingw32\bin APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 -# AppVeyor doesn't provide 32-bit compilers for MinGW-w64 -# - TOOLSET: gcc -# ADDRESS_MODEL: 32 -# B2_ARGS: cxxflags=-std=c++03 -# ADDPATH: C:\mingw-w64\i686-6.3.0-posix-dwarf-rt_v5-rev1\bin -# APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 -# - TOOLSET: gcc -# ADDRESS_MODEL: 32 -# B2_ARGS: cxxflags=-std=c++11 -# ADDPATH: C:\mingw-w64\i686-6.3.0-posix-dwarf-rt_v5-rev1\bin -# APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 -# - TOOLSET: gcc -# ADDRESS_MODEL: 32 -# B2_ARGS: cxxflags=-std=gnu++03 -# ADDPATH: C:\mingw-w64\i686-6.3.0-posix-dwarf-rt_v5-rev1\bin -# APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 -# - TOOLSET: gcc -# ADDRESS_MODEL: 32 -# B2_ARGS: cxxflags=-std=gnu++11 -# ADDPATH: C:\mingw-w64\i686-6.3.0-posix-dwarf-rt_v5-rev1\bin -# APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 install: - cd .. @@ -139,4 +98,5 @@ build: off test_script: - PATH=%ADDPATH%;%PATH% - - b2 -j3 libs/sync/test variant=release toolset=%TOOLSET% address-model=%ADDRESS_MODEL% %B2_ARGS% + - if not "%CXXSTD%" == "" set CXXSTD=cxxstd=%CXXSTD% + - b2 -j3 libs/sync/test variant=release toolset=%TOOLSET% address-model=%ADDRESS_MODEL% %CXXSTD% %B2_ARGS%