Merge branch 'develop'

.appveyor.yml

@@ -6,6 +6,8 @@
 
 version: 1.0.{build}-{branch}
 
+shallow_clone: false
+
 branches:
   only:
     - master
@@ -17,10 +19,14 @@ branches:
 
 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
@@ -31,6 +37,7 @@ environment:
     B2_VARIANT: release,debug
     # Include OpenCppCoverage and git bash (avoid WSL bash)
     PATH: 'C:\Program Files\OpenCppCoverage;C:\Program Files\Git\bin;%PATH%'
+    # CODECOV_TOKEN: { secure: BUWmc1TLOFKpwqt5vE27s8j5nZKbEhq2s4BAUx2oap4dBrHEUPwdNScqfYBecLxm }
   matrix:
     - FLAVOR: Visual Studio 2019
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
@@ -104,9 +111,6 @@ environment:
       configuration: Debug
       BOOST_ROOT: C:\Libraries\boost_1_73_0
       COVERAGE: true
-      # Work around for https://community.codecov.io/t/bash-script-does-not-detect-appveyor/1094
-      APPVEYOR: true
-      CI: true
     # Superproject CMake build
     - FLAVOR: Superproject CMake build - VS 2019
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
@@ -123,8 +127,9 @@ environment:
         secure: Qq4PZ3QlpYtg3HEyn9r2Og==
 
 install:
-  - git clone https://github.com/boostorg/boost-ci.git C:\boost-ci-cloned
-  - xcopy /s /e /q /i /y C:\boost-ci-cloned\ci .\ci
+  - 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
 
@@ -154,20 +159,20 @@ for:
       - ps: |
             If ($env:COVERAGE -eq "true") {
               choco install opencppcoverage
-              Invoke-WebRequest -Uri 'https://codecov.io/bash' -OutFile codecov.sh
+              Invoke-WebRequest -Uri https://uploader.codecov.io/latest/windows/codecov.exe -Outfile codecov.exe
               OpenCppCoverage.exe --quiet --export_type cobertura:cobertura.xml `
                 --sources ${env:APPVEYOR_BUILD_FOLDER} --modules "$PWD" `
+                --excluded_line_regex '.*// LCOV_EXCL_LINE' `
+                --excluded_line_regex '.*// coverity\[dead_error_line\]' `
+                --excluded_line_regex '\s*[{}]*\s*' `
+                --excluded_line_regex '\s*(\} )?else( \{)?\s*' `
                 --cover_children --working_dir "$PWD" -- ctest -C Debug
-              $commit = if ($env:APPVEYOR_PULL_REQUEST_HEAD_COMMIT) { $env:APPVEYOR_PULL_REQUEST_HEAD_COMMIT } else { $env:APPVEYOR_REPO_COMMIT }
-              bash codecov.sh -f cobertura.xml -n Appveyor -e APPVEYOR_BUILD_WORKER_IMAGE `
-                -C $commit `
-                -X gcov -X search -Z `
-                -U "-s" -A "-s"
+              ./codecov.exe -n Appveyor -e APPVEYOR_BUILD_WORKER_IMAGE
             }
       # Build consumer example test
       - cmake --build . --config %configuration% --target install
       - del /F /S /Q *
-      - cmake ../test/exampleProject -G "%GENERATOR%" -DCMAKE_PREFIX_PATH=%APPVEYOR_BUILD_FOLDER%\installed
+      - cmake -DBOOST_NOWIDE_INSTALL_TEST=ON -G "%GENERATOR%" -DCMAKE_PREFIX_PATH=%APPVEYOR_BUILD_FOLDER%\installed ../test/cmake_test
       - cmake --build . --config %configuration%
       - ctest --output-on-failure -C %configuration% --parallel 4
   # Superproject CMake build