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

Sweep out two leftover references to master

Browse Source 
This is basically cherry-picking the usable parts from #2067
This commit is contained in:
Martin Hořeňovský 2020-10-23 23:02:44 +02:00
parent 7b9bf633be
commit 967b82231c
No known key found for this signature in database
GPG Key ID: DE48307B8B0D381A
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.conan/build.py
View File

@ -26,8 +26,8 @@ class BuilderSettings(object):
""" Set Catch2 repository to be used on upload. """ Set Catch2 repository to be used on upload.
The upload server address could be customized by env var The upload server address could be customized by env var
CONAN_UPLOAD. If not defined, the method will check the branch name. CONAN_UPLOAD. If not defined, the method will check the branch name.
Only master or CONAN_STABLE_BRANCH_PATTERN will be accepted. Only devel or CONAN_STABLE_BRANCH_PATTERN will be accepted.
The master branch will be pushed to testing channel, because it does The devel branch will be pushed to testing channel, because it does
not match the stable pattern. Otherwise it will upload to stable not match the stable pattern. Otherwise it will upload to stable
channel. channel.
""" """

2
codecov.yml
View File

@ -15,7 +15,7 @@ coverage:
codecov: codecov:
branch: master branch: devel
max_report_age: off max_report_age: off
comment: comment: