From 967b82231cbfc856045259cb8810e871653a1179 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Ho=C5=99e=C5=88ovsk=C3=BD?= Date: Fri, 23 Oct 2020 23:02:44 +0200 Subject: [PATCH] Sweep out two leftover references to master This is basically cherry-picking the usable parts from #2067 --- .conan/build.py | 4 ++-- codecov.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.conan/build.py b/.conan/build.py index ba075b6d..e163d5f4 100644 --- a/.conan/build.py +++ b/.conan/build.py @@ -26,8 +26,8 @@ class BuilderSettings(object): """ Set Catch2 repository to be used on upload. The upload server address could be customized by env var CONAN_UPLOAD. If not defined, the method will check the branch name. - Only master or CONAN_STABLE_BRANCH_PATTERN will be accepted. - The master branch will be pushed to testing channel, because it does + Only devel or CONAN_STABLE_BRANCH_PATTERN will be accepted. + The devel branch will be pushed to testing channel, because it does not match the stable pattern. Otherwise it will upload to stable channel. """ diff --git a/codecov.yml b/codecov.yml index b100a026..357cb5eb 100644 --- a/codecov.yml +++ b/codecov.yml @@ -15,7 +15,7 @@ coverage: codecov: - branch: master + branch: devel max_report_age: off comment: