From befd75ebbf7fe3b0ce5b91a82bc232e84fc5d3fc Mon Sep 17 00:00:00 2001
From: gcontini <1121667+gcontini@users.noreply.github.com>
Date: 周四, 20 5月 2021 10:58:02 +0800
Subject: [PATCH] fix mingw tests

---
 .travis.yml |   74 +++++++------------------------------
 1 files changed, 14 insertions(+), 60 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f7ac610..41137d6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -43,6 +43,7 @@
           packages:
              - cmake
              - valgrind
+             - libc6-dbg
              - libssl-dev
              - zlib1g-dev
              - libboost-dev
@@ -59,7 +60,7 @@
          - cat /proc/mounts
          - ls -lLai /dev/disk/by-uuid
          - ls -lLai /dev/disk/by-label
-         - ls -la /dev
+         - ls -lai /dev
          - ls -la /run
          - cmake --build . --target install
          - ctest -T memcheck; cat /tmp/open-license.log
@@ -165,7 +166,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 && 
@@ -194,40 +195,29 @@
              - wine64
              - p7zip-full
      before_script:
-        - cd build
-        - wget -c https://dl.bintray.com/boostorg/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 build
+        - 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
         - cd boost_1_71_0
         - ./bootstrap.sh
         - travis_wait 30 ./b2 toolset=gcc-mingw target-os=windows address-model=64 --with-date_time --with-test --with-filesystem --with-program_options --with-regex --with-serialization --with-system runtime-link=static --prefix=./dist release install
         - cd ..
-        - wget --no-check-certificate https://bintray.com/vszakats/generic/download_file?file_path=openssl-1.0.2h-win64-mingw.7z -O openssl.7z
-        - 7z x openssl.7z
-        - 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/ ..
+        - wget --no-check-certificate https://github.com/open-license-manager/build-dependencies/raw/main/openssl/openssl-dev-1.0.2s-x86_64-win-mingw-w64.zip -O openssl.zip
+        - unzip openssl.zip
+        - 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/ ..
    - 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:
-         - travis_wait 40 ./scripts/windows_download_boost.bat
-         - 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:
@@ -255,43 +245,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