update CI

fix boostorg#31, fix boostorg#20
alandefreitas · Oct 31, 2022 · b999a63 · b999a63
1 parent 5d6fefd
commit b999a63
Show file tree

Hide file tree

Showing 11 changed files with 1,017 additions and 622 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -1,5 +1,6 @@
 # Copyright 2016, 2017 Peter Dimov
-# Copyright (C) 2017 - 2019 James E. King III
+# Copyright 2017 - 2019 James E. King III
+# Copyright 2019 - 2021 Alexander Grund
 # Distributed under the Boost Software License, Version 1.0.
 # (See accompanying file LICENSE_1_0.txt or copy at http://boost.org/LICENSE_1_0.txt)
 
@@ -21,7 +22,7 @@
 
 version: 1.0.{build}-{branch}
 
-shallow_clone: true
+shallow_clone: false
 
 branches:
   only:
@@ -33,115 +34,101 @@ branches:
     - /pr\/.*/
 
 matrix:
+  fast_finish: false
   # Adding MAYFAIL to any matrix job allows it to fail but the build stays green:
   allow_failures:
     - MAYFAIL: true
 
 environment:
   global:
+    B2_CI_VERSION: 1
+    GIT_FETCH_JOBS: 4
     # see: http://www.boost.org/build/doc/html/bbv2/overview/invocation.html#bbv2.overview.invocation.properties
     # to use the default for a given environment, comment it out; recommend you build debug and release however:
     # on Windows it is important to exercise all the possibilities, especially shared vs static, however most
     # libraries that care about this exercise it in their Jamfiles...
-    # B2_ADDRESS_MODEL: address-model=64,32
-    # B2_LINK: link=shared,static
+    B2_ADDRESS_MODEL: 32,64
+    B2_LINK: shared,static
     # B2_THREADING: threading=multi,single
-    B2_VARIANT: variant=release
+    B2_VARIANT: release
 
   matrix:
+    - FLAVOR: Visual Studio 2022
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022
+      B2_CXXFLAGS: -permissive-
+      B2_CXXSTD: 14,17,20
+      B2_TOOLSET: msvc-14.3
+
     - FLAVOR: Visual Studio 2019
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
-      B2_ADDRESS_MODEL: address-model=64
-      B2_CXXFLAGS: cxxflags=-permissive-
-      B2_CXXSTD: 17 # 2a
+      B2_CXXFLAGS: -permissive-
+      B2_CXXSTD: 14,17,2a
       B2_TOOLSET: msvc-14.2
 
     - FLAVOR: Visual Studio 2017 C++2a Strict
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-      B2_ADDRESS_MODEL: address-model=64
-      B2_CXXFLAGS: cxxflags=-permissive-
-      B2_CXXSTD: 17 # 2a
-      B2_TOOLSET: msvc-14.1
-
-    - FLAVOR: Visual Studio 2017 C++17
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-      B2_ADDRESS_MODEL: address-model=64
-      B2_CXXSTD: 17
+      B2_CXXFLAGS: -permissive-
+      B2_CXXSTD: 2a
       B2_TOOLSET: msvc-14.1
-      B2_VARIANT: variant=debug
 
-    - FLAVOR: Visual Studio 2017 C++14 (Default)
+    - FLAVOR: Visual Studio 2017 C++14/17
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-      B2_ADDRESS_MODEL: address-model=64,32
+      B2_CXXSTD: 14,17
       B2_TOOLSET: msvc-14.1
 
     - FLAVOR: clang-cl
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-      B2_ADDRESS_MODEL: address-model=64
-      B2_CXXSTD: 11
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
+      ADDCOMMANDS: '"C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat"'
+      B2_ADDRESS_MODEL: 64
+      B2_CXXSTD: 11,14,17
       B2_TOOLSET: clang-win
 
-    - FLAVOR: Visual Studio 2015 C++14 (Default)
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-      B2_ADDRESS_MODEL: address-model=64,32
-      B2_TOOLSET: msvc-14.0
-      B2_VARIANT: variant=debug
+    # not supported
+    # - FLAVOR: Visual Studio 2015, 2013
+    #   APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+    #   B2_TOOLSET: msvc-12.0,msvc-14.0
 
-    - FLAVOR: Visual Studio 2010, 2012, 2013
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-      B2_TOOLSET: msvc-10.0,msvc-11.0,msvc-12.0
+    # - FLAVOR: Visual Studio 2008, 2010, 2012
+    #   APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+    #   B2_TOOLSET: msvc-9.0,msvc-10.0,msvc-11.0
+    #   B2_ADDRESS_MODEL: 32 # No 64bit support
 
     - FLAVOR: cygwin (32-bit)
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
       ADDPATH: C:\cygwin\bin;
-      B2_ADDRESS_MODEL: address-model=32
-      B2_CXXSTD: 03,11
-      # https://github.com/boostorg/test/issues/144
-      B2_DEFINES: define=_POSIX_C_SOURCE=200112L
-      B2_THREADING: threadapi=pthread
+      B2_ADDRESS_MODEL: 32
+      B2_CXXSTD: 11,14,1z
       B2_TOOLSET: gcc
-      B2_VARIANT: variant=debug
 
     - FLAVOR: cygwin (64-bit)
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
       ADDPATH: C:\cygwin64\bin;
-      B2_ADDRESS_MODEL: address-model=64
-      B2_CXXSTD: 11,17
-      # https://github.com/boostorg/test/issues/144
-      B2_DEFINES: define=_POSIX_C_SOURCE=200112L define=__USE_ISOC99
-      B2_THREADING: threadapi=pthread
+      B2_ADDRESS_MODEL: 64
+      B2_CXXSTD: 11,14,1z
       B2_TOOLSET: gcc
 
     - FLAVOR: mingw32
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-      ARCH: i686
-      B2_ADDRESS_MODEL: address-model=32
-      B2_CXXSTD: 03,11
-      SCRIPT: ci\appveyor\mingw.bat
-      B2_VARIANT: variant=debug
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
+      B2_ADDRESS_MODEL: 32
+      ADDPATH: C:\mingw\bin;
+      B2_CXXSTD: 11,14,17,2a
+      B2_TOOLSET: gcc
 
     - FLAVOR: mingw64
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-      ARCH: x86_64
-      B2_ADDRESS_MODEL: address-model=64
-      B2_CXXSTD: 11,17
-      B2_DEFINES: define=__USE_ISOC99
-      SCRIPT: ci\appveyor\mingw.bat
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
+      ADDPATH: C:\mingw-w64\x86_64-8.1.0-posix-seh-rt_v6-rev0\mingw64\bin;
+      B2_ADDRESS_MODEL: 64
+      B2_CXXSTD: 11,14,17,2a
+      B2_TOOLSET: gcc
 
 install:
-  - set SELF=%APPVEYOR_PROJECT_NAME:-=_%
-  - git clone https://github.com/boostorg/boost-ci.git C:\boost-ci
-  - xcopy /s /e /q /i C:\boost-ci\ci .\ci
+  - '%ADDCOMMANDS%'
+  - git clone --depth 1 https://github.com/boostorg/boost-ci.git C:\boost-ci-cloned
+  # Copy ci folder if not testing Boost.CI
+  - if NOT "%APPVEYOR_PROJECT_NAME%" == "boost-ci" xcopy /s /e /q /i /y C:\boost-ci-cloned\ci .\ci
+  - rmdir /s /q C:\boost-ci-cloned
   - ci\appveyor\install.bat
 
 build: off
 
-test_script:
-  - set SELF=%APPVEYOR_PROJECT_NAME:-=_%
-  - PATH=%ADDPATH%%PATH%
-  # The definition of B2_TOOLCXX omits B2_CXXSTD= if it was not defined above
-  - IF NOT DEFINED B2_CXXSTD (SET B2_TOOLCXX=toolset=%B2_TOOLSET%) ELSE (SET B2_TOOLCXX=toolset=%B2_TOOLSET% cxxstd=%B2_CXXSTD%)
-  # Echo the complete build command to the build log
-  - IF NOT DEFINED SCRIPT                         (ECHO b2 libs/%SELF:\=/% %B2_TOOLCXX% %B2_CXXFLAGS% %B2_DEFINES% %B2_THREADING% %B2_ADDRESS_MODEL% %B2_LINK% %B2_THREADING% %B2_VARIANT% -j3)
-  # Now go build...
-  - IF DEFINED SCRIPT (call libs\%SELF%\%SCRIPT%) ELSE (b2 libs/%SELF:\=/% %B2_TOOLCXX% %B2_CXXFLAGS% %B2_DEFINES% %B2_THREADING% %B2_ADDRESS_MODEL% %B2_LINK% %B2_THREADING% %B2_VARIANT% -j3)
+test_script: ci\build.bat