3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2024-11-25 23:06:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Try uploading in-development versions of v3 as testing packages

Browse Source
This commit is contained in:
Martin Hořeňovský 2020-01-25 09:52:13 +01:00
parent d0257fc1ff
commit 2e1ce37faa
No known key found for this signature in database
GPG Key ID: DE48307B8B0D381A
4 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.conan/build.py
View File

@ -85,7 +85,7 @@ if __name__ == "__main__":
reference=settings.reference, reference=settings.reference,
channel=settings.channel, channel=settings.channel,
upload=settings.upload, upload=settings.upload,
upload_only_when_stable=settings.upload_only_when_stable, upload_only_when_stable=False,
stable_branch_pattern=settings.stable_branch_pattern, stable_branch_pattern=settings.stable_branch_pattern,
login_username=settings.login_username, login_username=settings.login_username,
username=settings.username, username=settings.username,

2
.conan/test_package/CMakeLists.txt
View File

@ -7,5 +7,5 @@ conan_basic_setup(TARGETS)
find_package(Catch2 REQUIRED CONFIG) find_package(Catch2 REQUIRED CONFIG)
add_executable(${PROJECT_NAME} test_package.cpp) add_executable(${PROJECT_NAME} test_package.cpp)
target_link_libraries(${PROJECT_NAME} CONAN_PKG::Catch2) target_link_libraries(${PROJECT_NAME} CONAN_PKG::Catch2Main)
set_target_properties(${PROJECT_NAME} PROPERTIES CXX_STANDARD 14) set_target_properties(${PROJECT_NAME} PROPERTIES CXX_STANDARD 14)

4
.conan/test_package/test_package.cpp
View File

@ -1,6 +1,4 @@
#define CATCH_CONFIG_MAIN #include <catch2/catch_test_macros.hpp>
#include <catch2/catch.hpp>
int Factorial( int number ) { int Factorial( int number ) {
return number <= 1 ? 1 : Factorial( number - 1 ) * number; return number <= 1 ? 1 : Factorial( number - 1 ) * number;

24
.travis.yml
View File

@ -158,18 +158,18 @@ matrix:
# # Special builds, e.g. conan # Special builds, e.g. conan
# - language: python - language: python
# python: python:
# - "3.7" - "3.7"
# install: install:
# - pip install conan-package-tools - pip install conan-package-tools
# env: env:
# - CONAN_GCC_VERSIONS=8 - CONAN_GCC_VERSIONS=8
# - CONAN_DOCKER_IMAGE=conanio/gcc8 - CONAN_DOCKER_IMAGE=conanio/gcc8
# - CPP14=1 - CPP14=1
# script: script:
# - python .conan/build.py - python .conan/build.py
before_script: before_script:
- export CXX=${COMPILER} - export CXX=${COMPILER}