From 37ac994f2be71eb5efb356c54aa987a5efb5101d Mon Sep 17 00:00:00 2001 From: Gabriele Contini <contini.mailing@gmail.com> Date: ćšć, 29 8æ 2019 19:28:10 +0800 Subject: [PATCH] test new travis configuration --- .gitignore | 1 + .travis.yml | 44 ++++++++++++++++++++++++++++++++------------ CMakeLists.txt | 2 +- 3 files changed, 34 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index 33cf0b9..6cd6db1 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ .cproject .settings .project +*.out \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index bc962bc..2e4539c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,17 +1,37 @@ language: cpp -branches: - only: - - master - -before_install: - - sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y - - echo "yes" | sudo add-apt-repository ppa:kalakris/cmake - - sudo apt-get update -qq - - sudo apt-get install cmake valgrind > /dev/null - - if [ "$CXX" = "g++" ]; then sudo apt-get install -qq g++-4.8; fi - - if [ "$CXX" = "g++" ]; then export CXX="g++-4.8" CC="gcc-4.8"; fi - - if [ "$CXX" = "g++" ]; then export CXX="g++-4.8" CC="gcc-4.8"; echo "+++GCC4.8"; fi +matrix: + include: + - os: linux + dist: bionic + addons: + apt: + packages: + - cmake + - valgrind + - libssl-dev + - zlib1g-dev + - libboost-test-dev + - libboost-filesystem-dev + - libboost-iostreams-dev + - libboost-program-options-dev + - libboost-system-dev + - libboost-thread-dev + - os: linux + dist: xenial + addons: + apt: + packages: + - cmake + - valgrind + - libssl-dev + - zlib1g-dev + - libboost-test-dev + - libboost-filesystem-dev + - libboost-iostreams-dev + - libboost-program-options-dev + - libboost-system-dev + - libboost-thread-dev before_script: - mkdir build diff --git a/CMakeLists.txt b/CMakeLists.txt index 36c3611..904dc52 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,7 +6,7 @@ #version variables, major and minor must be 1 character only SET(LICENSECC_MAJOR_VERSION 1) -SET(LICENSECC_MINOR_VERSION 0) +SET(LICENSECC_MINOR_VERSION 1) SET(LICENSECC_PATCH_VERSION 0 CACHE STRING "License++ patch version string") SET(LICENSECC_INT_VERSION "${LICENSECC_MAJOR_VERSION}${LICENSECC_MINOR_VERSION}${LICENSECC_PATCH_VERSION}") SET(LICENSECC_VERSION "${LICENSECC_MAJOR_VERSION}.${LICENSECC_MINOR_VERSION}.${LICENSECC_PATCH_VERSION}") -- Gitblit v1.9.1