From b84510338059d30f58353695b52d37b27d41c3f9 Mon Sep 17 00:00:00 2001 From: gcontini <1121667+gcontini@users.noreply.github.com> Date: 周三, 19 5月 2021 15:08:25 +0800 Subject: [PATCH] test boost root --- .travis.yml | 42 +++--------------------------------------- 1 files changed, 3 insertions(+), 39 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2b5e856..df2ee32 100644 --- a/.travis.yml +++ b/.travis.yml @@ -165,7 +165,7 @@ - docker run --name centos8_toconfigure -v `pwd`:/root/open-license-manager centos:centos8 /bin/bash -c \ "yum -y update && yum -y groupinstall 'Development Tools' && yum -y install wget cmake boost boost-devel openssl-devel zlib-devel && - dnf -y --enablerepo=PowerTools install boost-static && + dnf -y --enablerepo=powertools install boost-static && wget https://github.com/openssl/openssl/archive/OpenSSL_1_1_1d.tar.gz && tar xzf OpenSSL_1_1_1d.tar.gz && cd openssl-OpenSSL_1_1_1d && ./config && make -j 8 && make install && @@ -225,7 +225,7 @@ directories: - "/C/local/boost" before_script: - - travis_wait 40 ./scripts/windows_download_boost.bat + - choco install boost-msvc-14.1 - cd "${TRAVIS_BUILD_DIR}" - cd build && cmake -G "Visual Studio 15 2017 Win64" -DBOOST_ROOT="C:/local/boost" -DSTATIC_RUNTIME=1 .. - os: windows @@ -255,43 +255,7 @@ 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 before_script: -- Gitblit v1.9.1