From 3d9590c241c8924d6d6963fadb100c452a052670 Mon Sep 17 00:00:00 2001 From: gcontini <1121667+gcontini@users.noreply.github.com> Date: 周日, 29 3月 2020 08:41:31 +0800 Subject: [PATCH] minor doc update --- .travis.yml | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 51 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9207dba..e432aa0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,11 +1,18 @@ language: cpp services: docker -matrix: +stages: + - name: test + - name: documentation + if: branch = develop + +jobs: include: - os: linux dist: bionic name: "Ubuntu 18.04 - Travis CI VM" + env: + - VIRTUAL_ENV=VM addons: apt: packages: @@ -46,6 +53,8 @@ - os: linux dist: bionic name: "Ubuntu 18.04 - Travis CI VM - Debug build" + env: + - VIRTUAL_ENV=VM addons: apt: packages: @@ -63,19 +72,17 @@ - libboost-date-time-dev - lcov before_script: - - cd build && cmake -DCMAKE_INSTALL_PREFIX=../../install -DCMAKE_BUILD_TYPE=Debug .. + - cd build && cmake -DCMAKE_INSTALL_PREFIX=../../install -DCMAKE_BUILD_TYPE=Debug -DCMAKE_BUILD_TYPE=Debug -DCODE_COVERAGE=ON .. script: - cmake --build . --target install - ctest - - ctest -T memcheck after_success: # Create lcov report - lcov --capture --directory . --output-file coverage.info - - lcov --remove coverage.info '/usr/*' --output-file coverage.info # filter system-files + - lcov --remove coverage.info '/usr/include/*' '*/ini/*' '*/test/*' --output-file coverage.info # filter system-files - lcov --list coverage.info # debug info # Uploading report to CodeCov - bash <(curl -s https://codecov.io/bash) -f coverage.info || echo "Codecov did not collect coverage reports" - - os: linux dist: bionic name: "CentOS-7 Docker" @@ -105,7 +112,7 @@ - docker commit centos8_toconfigure centos8_configured script: - docker run --name centos8_make -v `pwd`:/root/open-license-manager centos8_configured /bin/bash -c \ - "cd /root/open-license-manager/build && make && make install && VIRT_ENV=CONTAINER make test" + "cd /root/open-license-manager/build && make && make install && VIRTUAL_ENV=DOCKER make test" - os: linux dist: bionic name: "Ubuntu 18.04 - MinGW cross-compile for Windows x64" @@ -180,9 +187,45 @@ script: - travis_wait 20 cmake --build . --target install --config Release - ctest -C Release - + - os: linux + dist: bionic + stage: documentation + name: "Deploy documentation" + addons: + apt: + packages: + - cmake + - libssl-dev + - zlib1g-dev + - libboost-dev + - libboost-test-dev + - libboost-filesystem-dev + - libboost-iostreams-dev + - libboost-program-options-dev + - libboost-system-dev + - libboost-thread-dev + - libboost-date-time-dev + - python3-pip + - python3-setuptools + - doxygen + - graphviz + before_script: + - pip3 install setuptools sphinx sphinx_rtd_theme breathe sphinx-markdown-tables recommonmark sphinx-rtd-theme sphinx-sitemap sphinxemoji + - cd build && cmake -DCMAKE_INSTALL_PREFIX=../../install .. + script: + - make documentation + deploy: + provider: pages + skip_cleanup: true + github_token: $GITHUB_TOKEN + keep_history: false + verbose: true + target_branch: "gh-pages" + local_dir: "build/docs/sphinx" + on: + branch: develop env: - - CTEST_OUTPUT_ON_FAILURE=1 + - CTEST_OUTPUT_ON_FAILURE=1 before_script: - cd build && cmake -DCMAKE_INSTALL_PREFIX=../../install .. -- Gitblit v1.9.1