improve CI

2025-12-13 06:59:45 +07:00 · 2019-11-27 02:19:41 +07:00
parent 6e968b5313
commit 0bd90a6f94
10 changed files with 228 additions and 47 deletions
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -1,11 +1,45 @@
-version: "{build}"
-shallow_clone: true
 image:
  - Visual Studio 2017
  - Visual Studio 2019
+
 platform:
-  - Win32
+  - x86
  - x64
-build_script:
-  - scripts\build_all.bat
-test: off
+
+configuration:
+  - Debug
+  - Release
+
+for:
+
+-
+  matrix:
+    only:
+      - platform: x86
+        configuration: Debug
+  build_script:
+    - scripts\build_debug_x86.bat
+
+-
+  matrix:
+    only:
+      - platform: x64
+        configuration: Debug
+  build_script:
+    - scripts\build_debug_x64.bat
+
+-
+  matrix:
+    only:
+      - platform: x86
+        configuration: Release
+  build_script:
+    - scripts\build_release_x86.bat
+
+-
+  matrix:
+    only:
+      - platform: x64
+        configuration: Release
+  build_script:
+    - scripts\build_release_x64.bat
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,42 +1,159 @@
 language: cpp
+
 matrix:
  include:
+
+    #
+    # windows (MSVC 2017)
+    #
+
+    - os: windows
+      stage: windows
+      name: debug, MSVC 2017, x86
+      script: ./scripts/build_debug_x86.bat
+
+    - os: windows
+      stage: windows
+      name: release, MSVC 2017, x86
+      script: ./scripts/build_release_x86.bat
+
+    - os: windows
+      stage: windows
+      name: debug, MSVC 2017, x64
+      script: ./scripts/build_debug_x64.bat
+
+    - os: windows
+      stage: windows
+      name: release, MSVC 2017, x64
+      script: ./scripts/build_release_x64.bat
+
+    #
+    # linux (g++-7)
+    #
+
    - os: linux
-      dist: trusty
-      addons: { apt: { sources: ubuntu-toolchain-r-test, packages: ["xorg-dev", "g++-7"] } }
-      env: MATRIX_EVAL="CC=gcc-7 && CXX=g++-7"
+      dist: xenial
+      stage: linux
+      name: debug, g++-7
+      addons: { apt: { sources: ["ubuntu-toolchain-r-test"], packages: ["g++-7"] } }
+      env: CC=gcc-7 CXX=g++-7
+      script: ./scripts/build_debug.sh
+
    - os: linux
-      dist: trusty
-      addons: { apt: { sources: ubuntu-toolchain-r-test, packages: ["xorg-dev", "g++-8"] } }
-      env: MATRIX_EVAL="CC=gcc-8 && CXX=g++-8"
+      dist: xenial
+      stage: linux
+      name: release, g++-7
+      addons: { apt: { sources: ["ubuntu-toolchain-r-test"], packages: ["g++-7"] } }
+      env: CC=gcc-7 CXX=g++-7
+      script: ./scripts/build_release.sh
+
+    #
+    # linux (g++-8)
+    #
+
    - os: linux
-      dist: trusty
-      addons: { apt: { sources: ["ubuntu-toolchain-r-test", "llvm-toolchain-trusty-5.0"], packages: ["xorg-dev", "clang-5.0", "g++-7"] } }
-      env: MATRIX_EVAL="CC=clang-5.0 && CXX=clang++-5.0"
+      dist: xenial
+      stage: linux
+      name: debug, g++-8
+      addons: { apt: { sources: ["ubuntu-toolchain-r-test"], packages: ["g++-8"] } }
+      env: CC=gcc-8 CXX=g++-8
+      script: ./scripts/build_debug.sh
+
    - os: linux
-      dist: trusty
-      addons: { apt: { sources: ["ubuntu-toolchain-r-test", "llvm-toolchain-trusty-6.0"], packages: ["xorg-dev", "clang-6.0", "g++-7"] } }
-      env: MATRIX_EVAL="CC=clang-6.0 && CXX=clang++-6.0"
+      dist: xenial
+      stage: linux
+      name: release, g++-8
+      addons: { apt: { sources: ["ubuntu-toolchain-r-test"], packages: ["g++-8"] } }
+      env: CC=gcc-8 CXX=g++-8
+      script: ./scripts/build_release.sh
+
+    #
+    # linux (clang++-5.0)
+    #
+
    - os: linux
-      dist: trusty
-      addons: { apt: { sources: ["ubuntu-toolchain-r-test", "llvm-toolchain-trusty-7"], packages: ["xorg-dev", "clang-7", "g++-7"] } }
-      env: MATRIX_EVAL="CC=clang-7 && CXX=clang++-7"
+      dist: xenial
+      stage: linux
+      name: debug, clang++-5.0
+      addons: { apt: { sources: ["ubuntu-toolchain-r-test", "llvm-toolchain-xenial-5.0"], packages: ["g++-7", "clang-5.0"] } }
+      env: CC=clang-5.0 CXX=clang++-5.0
+      script: ./scripts/build_debug.sh
+
    - os: linux
-      dist: trusty
-      addons: { apt: { sources: ["ubuntu-toolchain-r-test", "llvm-toolchain-trusty-8"], packages: ["xorg-dev", "clang-8", "g++-7"] } }
-      env: MATRIX_EVAL="CC=clang-8 && CXX=clang++-8"
+      dist: xenial
+      stage: linux
+      name: release, clang++-5.0
+      addons: { apt: { sources: ["ubuntu-toolchain-r-test", "llvm-toolchain-xenial-5.0"], packages: ["g++-7", "clang-5.0"] } }
+      env: CC=clang-5.0 CXX=clang++-5.0
+      script: ./scripts/build_release.sh
+
+    #
+    # linux (clang++-6.0)
+    #
+
+    - os: linux
+      dist: xenial
+      stage: linux
+      name: debug, clang++-6.0
+      addons: { apt: { sources: ["ubuntu-toolchain-r-test", "llvm-toolchain-xenial-6.0"], packages: ["g++-7", "clang-6.0"] } }
+      env: CC=clang-6.0 CXX=clang++-6.0
+      script: ./scripts/build_debug.sh
+
+    - os: linux
+      dist: xenial
+      stage: linux
+      name: release, clang++-6.0
+      addons: { apt: { sources: ["ubuntu-toolchain-r-test", "llvm-toolchain-xenial-6.0"], packages: ["g++-7", "clang-6.0"] } }
+      env: CC=clang-6.0 CXX=clang++-6.0
+      script: ./scripts/build_release.sh
+
+    #
+    # macosx (xcode10)
+    #
+
    - os: osx
      osx_image: xcode10
-      compiler: clang
+      stage: macosx
+      name: debug, xcode10
+      script: ./scripts/build_debug.sh
+
+    - os: osx
+      osx_image: xcode10
+      stage: macosx
+      name: release, xcode10
+      script: ./scripts/build_release.sh
+
+    #
+    # macosx (xcode11)
+    #
+
+    - os: osx
+      osx_image: xcode11
+      stage: macosx
+      name: debug, xcode11
+      script: ./scripts/build_debug.sh
+
+    - os: osx
+      osx_image: xcode11
+      stage: macosx
+      name: release, xcode11
+      script: ./scripts/build_release.sh
+
+    #
+    # coverage
+    #
+
+    - os: osx
+      osx_image: xcode10
+      stage: coverage
+      name: coverage, xcode10
      addons: { homebrew: { packages: ["lcov"] } }
-      after_success: ./scripts/upload_coverage.sh
+      script: ./scripts/upload_coverage.sh
+
 before_install:
-  - eval "${MATRIX_EVAL}"
  - if [ "$TRAVIS_OS_NAME" == 'linux' ]; then
    mkdir $HOME/cmake;
    export PATH="$HOME/cmake/bin:$PATH";
    travis_retry wget -q https://cmake.org/files/v3.11/cmake-3.11.4-Linux-x86_64.sh;
    sh cmake-3.11.4-Linux-x86_64.sh --prefix=$HOME/cmake --exclude-subdir --skip-license;
    fi
-script:
-  - ./scripts/build_all.sh
--- a/scripts/build_all.bat
+++ b/scripts/build_all.bat
@@ -1,7 +1,9 @@
@echo off
 set SCRIPT_DIR=%~dp0%
-call %SCRIPT_DIR%\build_debug.bat || goto :error
-call %SCRIPT_DIR%\build_release.bat || goto :error
+call %SCRIPT_DIR%\build_debug_x86.bat || goto :error
+call %SCRIPT_DIR%\build_debug_x64.bat || goto :error
+call %SCRIPT_DIR%\build_release_x86.bat || goto :error
+call %SCRIPT_DIR%\build_release_x64.bat || goto :error

 goto :EOF

--- a/scripts/build_debug.sh
+++ b/scripts/build_debug.sh
@@ -1,9 +1,9 @@
 #!/bin/bash
 set -e
 BUILD_DIR=`dirname "$BASH_SOURCE"`/../build
-mkdir -p $BUILD_DIR/debug
-cd $BUILD_DIR/debug
+mkdir -p $BUILD_DIR/Debug
+cd $BUILD_DIR/Debug
 cmake -DCMAKE_BUILD_TYPE=Debug ../..
-cmake --build . -- -j8
+cmake --build .
 ctest --verbose
 cd ../..
--- a/scripts/build_debug_x64.bat
+++ b/scripts/build_debug_x64.bat
@@ -1,11 +1,11 @@
@echo off
 set BUILD_DIR=%~dp0%\..\build
-mkdir %BUILD_DIR%\debug || goto :error
-cd %BUILD_DIR%\debug || goto :error
-cmake ../.. || goto :error
+mkdir %BUILD_DIR%\Debug\x64 || goto :error
+cd %BUILD_DIR%\Debug\x64 || goto :error
+cmake ..\..\.. -A x64 || goto :error
 cmake --build . --config Debug || goto :error
 ctest --verbose || goto :error
-cd ..\.. || goto :error
+cd ..\..\.. || goto :error

 goto :EOF

--- a/scripts/build_debug_x86.bat
+++ b/scripts/build_debug_x86.bat
@@ -0,0 +1,14 @@
+@echo off
+set BUILD_DIR=%~dp0%\..\build
+mkdir %BUILD_DIR%\Debug\x86 || goto :error
+cd %BUILD_DIR%\Debug\x86 || goto :error
+cmake ..\..\.. -A Win32 || goto :error
+cmake --build . --config Debug || goto :error
+ctest --verbose || goto :error
+cd ..\..\.. || goto :error
+
+goto :EOF
+
+:error
+echo Failed with error #%errorlevel%.
+exit /b %errorlevel%
--- a/scripts/build_release.sh
+++ b/scripts/build_release.sh
@@ -1,9 +1,9 @@
 #!/bin/bash
 set -e
 BUILD_DIR=`dirname "$BASH_SOURCE"`/../build
-mkdir -p $BUILD_DIR/release
-cd $BUILD_DIR/release
+mkdir -p $BUILD_DIR/Release
+cd $BUILD_DIR/Release
 cmake -DCMAKE_BUILD_TYPE=Release ../..
-cmake --build . -- -j8
+cmake --build .
 ctest --verbose
 cd ../..
--- a/scripts/build_release_x64.bat
+++ b/scripts/build_release_x64.bat
@@ -1,11 +1,11 @@
@echo off
 set BUILD_DIR=%~dp0%\..\build
-mkdir %BUILD_DIR%\release || goto :error
-cd %BUILD_DIR%\release || goto :error
-cmake ../.. || goto :error
+mkdir %BUILD_DIR%\Release\x64 || goto :error
+cd %BUILD_DIR%\Release\x64 || goto :error
+cmake ..\..\.. -A x64 || goto :error
 cmake --build . --config Release || goto :error
 ctest --verbose || goto :error
-cd ..\.. || goto :error
+cd ..\..\.. || goto :error

 goto :EOF

--- a/scripts/build_release_x86.bat
+++ b/scripts/build_release_x86.bat
@@ -0,0 +1,14 @@
+@echo off
+set BUILD_DIR=%~dp0%\..\build
+mkdir %BUILD_DIR%\Release\x86 || goto :error
+cd %BUILD_DIR%\Release\x86 || goto :error
+cmake ..\..\.. -A Win32 || goto :error
+cmake --build . --config Release || goto :error
+ctest --verbose || goto :error
+cd ..\..\.. || goto :error
+
+goto :EOF
+
+:error
+echo Failed with error #%errorlevel%.
+exit /b %errorlevel%
--- a/scripts/upload_coverage.sh
+++ b/scripts/upload_coverage.sh
@@ -5,13 +5,13 @@ BUILD_DIR=`dirname "$BASH_SOURCE"`/../build
 mkdir -p $BUILD_DIR/coverage
 cd $BUILD_DIR/coverage
 cmake -DCMAKE_BUILD_TYPE=Debug -DBUILD_WITH_COVERAGE=ON ../..
-cmake --build . -- -j8
+cmake --build .

 lcov -d . -z
 ctest --verbose

 lcov -d . -c -o "coverage.info"
-lcov -r "coverage.info" "*/usr/*" "*/catch.hpp" "*/catch_main.cpp" "*_tests.cpp" -o "coverage.info"
+lcov -r "coverage.info" "*/usr/*" "*/catch.hpp" "*/catch_main.cpp" "*_tests.cpp" "*_examples.cpp" -o "coverage.info"
 lcov -l "coverage.info"

 bash <(curl -s https://codecov.io/bash) || echo "Codecov did not collect coverage reports"