From ea4d5c4c72303c4ef528b530f1956bd9961e9335 Mon Sep 17 00:00:00 2001
From: gcontini <1121667+gcontini@users.noreply.github.com>
Date: 周四, 20 5月 2021 11:39:11 +0800
Subject: [PATCH] try fix tests

---
 .travis.yml |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 737ff62..880261c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -40,9 +40,11 @@
      - CTEST_OUTPUT_ON_FAILURE=1
      addons:
         apt:
+          update: true
           packages:
              - cmake
              - valgrind
+             - libc6-dbg
              - libssl-dev
              - zlib1g-dev
              - libboost-dev
@@ -175,13 +177,14 @@
         - 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 && src/inspector/lccinspector && CTEST_OUTPUT_ON_FAILURE=1 VIRTUAL_ENV=DOCKER make test"
    - os: linux
-     dist: bionic
-     name: "Ubuntu 18.04 - MinGW cross-compile for Windows x64"
+     dist: focal
+     name: "Ubuntu 20.04 - MinGW cross-compile for Windows x64"
      env:
      - CTEST_OUTPUT_ON_FAILURE=1      
      - WINEARCH=win64
      addons:
         apt:
+          update: true
           packages:
              - cmake 
              - binutils-mingw-w64 
@@ -194,17 +197,17 @@
              - wine64
              - p7zip-full
      before_script:
+        - 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
-        - sudo ln -s /usr/bin/x86_64-w64-mingw32-g++ /usr/local/bin/g++-mingw
         - 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)"
      before_script:

--
Gitblit v1.9.1