Skip to content

Commit

Permalink
Merge pull request #9 from karel-burda/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
karel-burda authored Nov 24, 2018
2 parents e4fddbb + da54a26 commit a9947a1
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 15 deletions.
19 changes: 7 additions & 12 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,9 @@
stages:
- test-utils, tests -- linux, debug, cppcheck, coverage, g++, 64-bit
- test-utils, tests -- osx, release with debug info, clang++, 64-bit
- test-utils, tests -- windows, release, msvc, 32-bit

git:
depth: 1

jobs:
matrix:
include:
- stage: test-utils, tests -- linux, debug, cppcheck, coverage, g++, 64-bit
- name: "test-utils, tests -- linux, debug, cppcheck, coverage, g++, 64-bit"
os: linux
dist: xenial
language: cpp
Expand All @@ -34,13 +29,13 @@ jobs:
- cmake -Bbuild -H. -DCMAKE_BUILD_TYPE:STRING=$BUILD_TYPE
- cmake -Bbuild/tests/unit -Htests/unit -Dtest-utils_DIR:PATH=$(pwd)/build -DCMAKE_BUILD_TYPE:STRING=$BUILD_TYPE
-DCOVERAGE:BOOL=ON
- cmake --build build/tests/unit --target run-all-tests-verbose --config $BUILD_TYPE
- cmake --build build/tests/unit --target run-all-tests-verbose --config $BUILD_TYPE -- -j $(nproc)

- bash <(curl -s https://codecov.io/bash)

- set +e

- stage: test-utils, tests -- osx, release with debug info, clang++, 64-bit
- name: "test-utils, tests -- osx, release with debug info, clang++, 64-bit"
os: osx
language: cpp
env: BUILD_TYPE="RelWithDebInfo"
Expand All @@ -50,11 +45,11 @@ jobs:

- cmake -Bbuild -H. -DCMAKE_BUILD_TYPE:STRING=$BUILD_TYPE
- cmake -Bbuild/tests/unit -Htests/unit -Dtest-utils_DIR:PATH=$(pwd)/build -DCMAKE_BUILD_TYPE:STRING=$BUILD_TYPE
- cmake --build build/tests/unit --target run-all-tests-verbose --config $BUILD_TYPE
- cmake --build build/tests/unit --target run-all-tests-verbose --config $BUILD_TYPE -- -j $(sysctl -n hw.ncpu)

- set +e

- stage: test-utils, tests -- windows, release, msvc, 32-bit
- name: "test-utils, tests -- windows, release, msvc, 32-bit"
os: windows
language: cpp
env: BUILD_TYPE="Release"
Expand All @@ -65,4 +60,4 @@ jobs:
- cmake -Bbuild/tests/unit -Htests/unit -Dtest-utils_DIR:PATH=$(pwd)/build -DCMAKE_BUILD_TYPE:STRING=$BUILD_TYPE
- cmake --build build/tests/unit --target run-all-tests-verbose --config $BUILD_TYPE

- set +e
- set +e
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.8 FATAL_ERROR)

project(test-utils VERSION 1.0.5 LANGUAGES CXX)
project(test-utils VERSION 1.0.6 LANGUAGES CXX)

add_library(${PROJECT_NAME} INTERFACE)

Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
![Version](https://img.shields.io/badge/version-1.0.5-green.svg)
![Version](https://img.shields.io/badge/version-1.0.6-green.svg)
[![License](https://img.shields.io/badge/license-MIT_License-green.svg?style=flat)](LICENSE)
[![Build Status](https://travis-ci.org/karel-burda/test-utils.svg?branch=master)](https://travis-ci.org/karel-burda/test-utils)
[![Codecov Status](https://codecov.io/gh/karel-burda/test-utils/branch/master/graph/badge.svg)](https://codecov.io/gh/karel-burda/test-utils/branch/master)
Expand Down Expand Up @@ -212,7 +212,7 @@ Continuous Integration is now being run Linux, OS X and Windows on Travis: https
Compilers are set-up to treat warnings as errors and with pedantic warning level.
Targets are built in one stage with debug symbols with code coverage measure and in release mode with debug symbols in the second one.

The project is using these stages:
The project is using these jobs:
* `test-utils, tests -- linux, debug, cppcheck, coverage, g++, 64-bit`
* `test-utils, tests -- osx, release with debug info, clang++, 64-bit`
* `test-utils, tests -- windows, release, msvc, 32-bit`
Expand Down
4 changes: 4 additions & 0 deletions tests/unit/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@ find_package(test-utils CONFIG REQUIRED)
message(STATUS "Found version of test-utils is: ${test-utils_VERSION}")
target_link_libraries(${PROJECT_NAME} PRIVATE burda::test-utils)

target_compile_options(${PROJECT_NAME}
PRIVATE
$<$<CXX_COMPILER_ID:MSVC>:/MP>)

burda_cmake_helpers_cpp_gtest_bootstrap_and_link(${PROJECT_NAME} "release-1.8.1" "Release" PRIVATE)

if (COVERAGE)
Expand Down

0 comments on commit a9947a1

Please sign in to comment.