From 938d47b06d69305a92d215522d64f80b4c8e3b70 Mon Sep 17 00:00:00 2001
From: gcontini <1121667+gcontini@users.noreply.github.com>
Date: 摹曛, 20 5月 2021 00:01:11 +0800
Subject: [PATCH] fix windows boost install

---
 .travis.yml |   21 +++++----------------
 1 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index df2ee32..737ff62 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -195,7 +195,7 @@
              - p7zip-full
      before_script:
         - cd build
-        - wget -c https://dl.bintray.com/boostorg/release/1.71.0/source/boost_1_71_0.tar.bz2
+        - wget -c https://boostorg.jfrog.io/artifactory/main/release/1.71.0/source/boost_1_71_0.tar.bz2
         - tar xjf boost_1_71_0.tar.bz2
         - sudo ln -s /usr/bin/x86_64-w64-mingw32-g++ /usr/local/bin/g++-mingw
         - cd boost_1_71_0
@@ -207,27 +207,16 @@
         - cmake -DCMAKE_TOOLCHAIN_FILE=../cmake/toolchain-ubuntu-mingw64.cmake -DCMAKE_INSTALL_PREFIX=../../install -DBOOST_ROOT=$PWD/boost_1_71_0/dist -DOPENSSL_ROOT_DIR=$PWD/openssl-1.0.2h-win64-mingw/ ..
    - os: windows
      name: "Widnows server 1803 - Visual Studio 15 2017 Win64 - (/MD)"
-     env:
-     - CTEST_OUTPUT_ON_FAILURE=1   
-     cache:
-         edge: true
-         directories:
-             - "/C/local/boost"
      before_script:
-         - travis_wait 40 ./scripts/windows_download_boost.bat
+         - choco install -y boost-msvc-14.1
          - cd "${TRAVIS_BUILD_DIR}/build"
-         - cmake -G "Visual Studio 15 2017 Win64" -DBOOST_ROOT="C:/local/boost" ..
+         - cmake -G "Visual Studio 15 2017 Win64" -DBOOST_ROOT="C:/local/boost_1_74_0" ..
 
    - os: windows
      name: "Widnows server 1803 - Visual Studio 15 2017 Win64 - (/MT)"
-     cache:
-         edge: true
-         directories:
-             - "/C/local/boost"
      before_script:
-         - 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 ..
+         - choco install -y boost-msvc-14.1
+         - cd build && cmake -G "Visual Studio 15 2017 Win64" -DBOOST_ROOT="C:/local/boost_1_74_0" -DSTATIC_RUNTIME=1 ..
    - os: windows
      name: "Widnows server 1803 - MinGW Win64"
      cache:

--
Gitblit v1.9.1