From f1d283e941680a97d74a2fb7f6bcdd9490efc394 Mon Sep 17 00:00:00 2001
From: nancy.liao <huihui.liao@greentest.com.cn>
Date: 周四, 29 5月 2025 18:14:27 +0800
Subject: [PATCH] 根据具体需求 修改了一个强制性的版本匹配,否则license返回结果不正确
---
.travis.yml | 63 ++++++++++++-------------------
1 files changed, 25 insertions(+), 38 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 41137d6..755d502 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,7 +10,7 @@
include:
- os: linux
dist: bionic
- name: "Ubuntu 18.04 - Travis CI VM"
+ name: "Travis CI VM"
env:
- VIRTUAL_ENV=VM
- CTEST_OUTPUT_ON_FAILURE=1
@@ -34,7 +34,25 @@
- ctest -T memcheck
- os: linux
dist: focal
- name: "Ubuntu 20.04 - Travis CI VM - Debug"
+ name: "Travis CI VM - Release"
+ env:
+ - VIRTUAL_ENV=VM
+ - CTEST_OUTPUT_ON_FAILURE=1
+ before_script:
+ - sudo apt-get update
+ - sudo apt-get install -y cmake libssl-dev zlib1g-dev libboost-dev libboost-filesystem-dev libboost-test-dev libboost-iostreams-dev libboost-program-options-dev libboost-system-dev libboost-thread-dev libboost-date-time-dev
+ - cd build && cmake -DCMAKE_INSTALL_PREFIX=../../install -DCMAKE_BUILD_TYPE=Release ..
+ script:
+ - cat /proc/mounts
+ - ls -lLai /dev/disk/by-uuid
+ - ls -lLai /dev/disk/by-label
+ - ls -lai /dev
+ - ls -la /run
+ - cmake --build . --target install
+ - ctest; cat /tmp/open-license.log
+ - os: linux
+ dist: bionic
+ name: "VM - set LCC_PROJECT_NAME"
env:
- VIRTUAL_ENV=VM
- CTEST_OUTPUT_ON_FAILURE=1
@@ -43,7 +61,6 @@
packages:
- cmake
- valgrind
- - libc6-dbg
- libssl-dev
- zlib1g-dev
- libboost-dev
@@ -57,44 +74,13 @@
before_script:
- cd build && cmake -DCMAKE_INSTALL_PREFIX=../../install -DCMAKE_BUILD_TYPE=Debug -DCODE_COVERAGE=ON -DLCC_PROJECT_NAME=MYPROJECT ..
script:
- - cat /proc/mounts
- - ls -lLai /dev/disk/by-uuid
- - ls -lLai /dev/disk/by-label
- - ls -lai /dev
- - ls -la /run
- - cmake --build . --target install
- - ctest -T memcheck; cat /tmp/open-license.log
- - os: linux
- dist: bionic
- name: "Ubuntu 18.04 - VM - set LCC_PROJECT_NAME"
- env:
- - VIRTUAL_ENV=VM
- - CTEST_OUTPUT_ON_FAILURE=1
- addons:
- apt:
- packages:
- - cmake
- - valgrind
- - 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
- before_script:
- - cd build && cmake -DCMAKE_INSTALL_PREFIX=../../install -DCMAKE_BUILD_TYPE=Debug DCODE_COVERAGE=ON -DLCC_PROJECT_NAME=MYPROJECT ..
- script:
- cmake --build . --target install
- ctest -T memcheck
- os: linux
dist: xenial
env:
- CTEST_OUTPUT_ON_FAILURE=1
- name: "Ubuntu 16.04 - Travis CI VM"
+ name: "Travis CI VM"
addons:
apt:
packages:
@@ -112,7 +98,7 @@
- libboost-date-time-dev
- os: linux
dist: bionic
- name: "Ubuntu 18.04 - Travis CI VM - Debug build"
+ name: "Travis CI VM - Debug build"
env:
- VIRTUAL_ENV=VM
- CTEST_OUTPUT_ON_FAILURE=1
@@ -176,13 +162,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: "MinGW cross-compile for Windows x64"
env:
- CTEST_OUTPUT_ON_FAILURE=1
- WINEARCH=win64
addons:
apt:
+ update: true
packages:
- cmake
- binutils-mingw-w64
--
Gitblit v1.9.1