Read-only mirrors. Development, issues and pull requests are on GitHub.

summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorMartin Hořeňovský2020-01-25 09:52:13 +0100
committerMartin Hořeňovský2020-01-25 21:09:48 +0100
commit2e1ce37faa10e70796034ab2c8969a4460cf51a8 (patch)
treebbb9113191694b2ac92807542582bf45166fdebe
parentd0257fc1ff130ab2f3cab646ab43c755f3b62e00 (diff)
downloadcatch3-2e1ce37faa10e70796034ab2c8969a4460cf51a8.tar.gz
Try uploading in-development versions of v3 as testing packages
-rw-r--r--.conan/build.py2
-rw-r--r--.conan/test_package/CMakeLists.txt2
-rw-r--r--.conan/test_package/test_package.cpp4
-rw-r--r--.travis.yml24
4 files changed, 15 insertions, 17 deletions
diff --git a/.conan/build.py b/.conan/build.py
index 27298651..b4b7211b 100644
--- a/.conan/build.py
+++ b/.conan/build.py
@@ -85,7 +85,7 @@ if __name__ == "__main__":
reference=settings.reference,
channel=settings.channel,
upload=settings.upload,
- upload_only_when_stable=settings.upload_only_when_stable,
+ upload_only_when_stable=False,
stable_branch_pattern=settings.stable_branch_pattern,
login_username=settings.login_username,
username=settings.username,
diff --git a/.conan/test_package/CMakeLists.txt b/.conan/test_package/CMakeLists.txt
index 1cd751ae..bfeedfbe 100644
--- a/.conan/test_package/CMakeLists.txt
+++ b/.conan/test_package/CMakeLists.txt
@@ -7,5 +7,5 @@ conan_basic_setup(TARGETS)
find_package(Catch2 REQUIRED CONFIG)
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)
diff --git a/.conan/test_package/test_package.cpp b/.conan/test_package/test_package.cpp
index cff50de5..3c08090b 100644
--- a/.conan/test_package/test_package.cpp
+++ b/.conan/test_package/test_package.cpp
@@ -1,6 +1,4 @@
-#define CATCH_CONFIG_MAIN
-
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
int Factorial( int number ) {
return number <= 1 ? 1 : Factorial( number - 1 ) * number;
diff --git a/.travis.yml b/.travis.yml
index ad56de39..3644cb08 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -158,18 +158,18 @@ matrix:
-# # Special builds, e.g. conan
-# - language: python
-# python:
-# - "3.7"
-# install:
-# - pip install conan-package-tools
-# env:
-# - CONAN_GCC_VERSIONS=8
-# - CONAN_DOCKER_IMAGE=conanio/gcc8
-# - CPP14=1
-# script:
-# - python .conan/build.py
+ # Special builds, e.g. conan
+ - language: python
+ python:
+ - "3.7"
+ install:
+ - pip install conan-package-tools
+ env:
+ - CONAN_GCC_VERSIONS=8
+ - CONAN_DOCKER_IMAGE=conanio/gcc8
+ - CPP14=1
+ script:
+ - python .conan/build.py
before_script:
- export CXX=${COMPILER}