Updated .yml files

This commit is contained in:
Edward Diener
2020-09-19 23:02:30 -04:00
parent 2ab48feed5
commit d12d2d9a3a
2 changed files with 9 additions and 12 deletions

View File

@@ -118,7 +118,7 @@ matrix:
- os: linux - os: linux
compiler: g++-8 compiler: g++-8
env: TOOLSET=gcc COMPILER=g++-8 CXXSTD=03,11,14,17 PPLIMITS=preprocessor_limits env: TOOLSET=gcc COMPILER=g++-8 CXXSTD=03,11,14,17 PPLIMITS=//preprocessor_limits
addons: addons:
apt: apt:
packages: packages:
@@ -138,7 +138,7 @@ matrix:
- os: linux - os: linux
compiler: g++-9 compiler: g++-9
env: TOOLSET=gcc COMPILER=g++-9 CXXSTD=03,11,14,17 PPLIMITS=preprocessor_limits env: TOOLSET=gcc COMPILER=g++-9 CXXSTD=03,11,14,17 PPLIMITS=//preprocessor_limits
addons: addons:
apt: apt:
packages: packages:
@@ -160,7 +160,7 @@ matrix:
- os: linux - os: linux
dist: bionic dist: bionic
compiler: g++-10 compiler: g++-10
env: TOOLSET=gcc COMPILER=g++-10 CXXSTD=03,11,14,17,2a PPLIMITS=preprocessor_limits env: TOOLSET=gcc COMPILER=g++-10 CXXSTD=03,11,14,17,2a PPLIMITS=//preprocessor_limits
addons: addons:
apt: apt:
packages: packages:
@@ -306,7 +306,7 @@ matrix:
- os: linux - os: linux
compiler: clang++-9 compiler: clang++-9
env: TOOLSET=clang COMPILER=clang++-9 CXXSTD=03,11,14,17,2a PPLIMITS=preprocessor_limits env: TOOLSET=clang COMPILER=clang++-9 CXXSTD=03,11,14,17,2a PPLIMITS=//preprocessor_limits
addons: addons:
apt: apt:
packages: packages:
@@ -330,7 +330,7 @@ matrix:
- os: linux - os: linux
compiler: clang++-10 compiler: clang++-10
env: TOOLSET=clang COMPILER=clang++-10 CXXSTD=03,11,14,17,2a PPLIMITS=preprocessor_limits env: TOOLSET=clang COMPILER=clang++-10 CXXSTD=03,11,14,17,2a PPLIMITS=//preprocessor_limits
addons: addons:
apt: apt:
packages: packages:
@@ -394,9 +394,7 @@ install:
script: script:
- |- - |-
echo "using $TOOLSET : : $COMPILER ;" > ~/user-config.jam echo "using $TOOLSET : : $COMPILER ;" > ~/user-config.jam
- cd libs/preprocessor/test - b2 libs/preprocessor/test$PPLIMITS -j 3 toolset=$TOOLSET cxxstd=$CXXSTD
- ../../../b2 -j 3 toolset=$TOOLSET cxxstd=$CXXSTD $PPLIMITS
- cd ../../..
notifications: notifications:
email: email:

View File

@@ -23,7 +23,7 @@ branches:
environment: environment:
matrix: matrix:
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
TOOLSET: msvc-10.0,msvc-11.0 TOOLSET: msvc-11.0
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
TOOLSET: msvc-12.0 TOOLSET: msvc-12.0
ADDRMD: 32,64 ADDRMD: 32,64
@@ -84,9 +84,8 @@ for:
- if not "%CXXSTD%" == "" set CXXSTD=cxxstd=%CXXSTD% - if not "%CXXSTD%" == "" set CXXSTD=cxxstd=%CXXSTD%
- if not "%ADDRMD%" == "" set ADDRMD=address-model=%ADDRMD% - if not "%ADDRMD%" == "" set ADDRMD=address-model=%ADDRMD%
- if not "%PREPROCESSOR%" == "" set PREPROCESSOR=cflags="%PREPROCESSOR%" - if not "%PREPROCESSOR%" == "" set PREPROCESSOR=cflags="%PREPROCESSOR%"
- cd libs/preprocessor/test - if not "%PPLIMITS%" == "" set PPLIMITS=//%PPLIMITS%
- ..\..\..\b2 -j3 toolset=%TOOLSET% %CXXSTD% %ADDRMD% %PREPROCESSOR% variant=debug,release %PPLIMITS% - b2 libs/preprocessor/test%PPLIMITS% -j3 toolset=%TOOLSET% %CXXSTD% %ADDRMD% %PREPROCESSOR% variant=debug,release
- cd ..\..\..
- -
matrix: matrix: