From 8dd25b041074da3fb46345024949f46b9b666cbc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Ho=C5=99e=C5=88ovsk=C3=BD?= Date: Wed, 21 Oct 2020 15:30:26 +0200 Subject: [PATCH] Fix bunch of links to master to point to v2.x branch Fixes #2063 Related to #2050 --- README.md | 4 ++-- codecov.yml | 2 +- docs/contributing.md | 4 ++-- docs/release-notes.md | 4 ++-- docs/tutorial.md | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 6579c3e8..f2124e3e 100644 --- a/README.md +++ b/README.md @@ -2,9 +2,9 @@ ![catch logo](artwork/catch2-logo-small.png) [![Github Releases](https://img.shields.io/github/release/catchorg/catch2.svg)](https://github.com/catchorg/catch2/releases) -[![Build Status](https://travis-ci.org/catchorg/Catch2.svg?branch=master)](https://travis-ci.org/catchorg/Catch2) +[![Build Status](https://travis-ci.org/catchorg/Catch2.svg?branch=v2.x)](https://travis-ci.org/catchorg/Catch2) [![Build status](https://ci.appveyor.com/api/projects/status/github/catchorg/Catch2?svg=true)](https://ci.appveyor.com/project/catchorg/catch2) -[![codecov](https://codecov.io/gh/catchorg/Catch2/branch/master/graph/badge.svg)](https://codecov.io/gh/catchorg/Catch2) +[![codecov](https://codecov.io/gh/catchorg/Catch2/branch/v2.x/graph/badge.svg)](https://codecov.io/gh/catchorg/Catch2) [![Try online](https://img.shields.io/badge/try-online-blue.svg)](https://wandbox.org/permlink/6JUH8Eybx4CtvkJS) [![Join the chat in Discord: https://discord.gg/4CWS9zD](https://img.shields.io/badge/Discord-Chat!-brightgreen.svg)](https://discord.gg/4CWS9zD) diff --git a/codecov.yml b/codecov.yml index 75809ee2..d26329af 100644 --- a/codecov.yml +++ b/codecov.yml @@ -19,7 +19,7 @@ coverage: codecov: - branch: master + branch: v2.x comment: layout: "diff" diff --git a/docs/contributing.md b/docs/contributing.md index 5ac0d558..ca050bf4 100644 --- a/docs/contributing.md +++ b/docs/contributing.md @@ -21,8 +21,8 @@ to the codebase itself. ## Using Git(Hub) -Ongoing development happens in the `master` branch for Catch2 v2, and in -`dev-v3` for the next major version, v3. +Ongoing development happens in the `v2.x` branch for Catch2 v2, and in +`devel` for the next major version, v3. Commits should be small and atomic. A commit is atomic when, after it is applied, the codebase, tests and all, still works as expected. Small diff --git a/docs/release-notes.md b/docs/release-notes.md index d8e396a7..75368788 100644 --- a/docs/release-notes.md +++ b/docs/release-notes.md @@ -666,7 +666,7 @@ than `single_include/catch.hpp`.** * CLR objects (`T^`) can now be stringified (#1216) * This affects code compiled as C++/CLI * Added `PredicateMatcher`, a matcher that takes an arbitrary predicate function (#1236) - * See [documentation for details](https://github.com/catchorg/Catch2/blob/master/docs/matchers.md) + * See [documentation for details](https://github.com/catchorg/Catch2/blob/v2.x/docs/matchers.md) ### Others * Modified CMake-installed pkg-config to allow `#include `(#1239) @@ -694,7 +694,7 @@ than `single_include/catch.hpp`.** * Added an option to warn (+ exit with error) when no tests were ran (#1158) * Use as `-w NoTests` * Added provisional support for Emscripten (#1114) -* [Added a way to override the fallback stringifier](https://github.com/catchorg/Catch2/blob/master/docs/configuration.md#fallback-stringifier) (#1024) +* [Added a way to override the fallback stringifier](https://github.com/catchorg/Catch2/blob/v2.x/docs/configuration.md#fallback-stringifier) (#1024) * This allows project's own stringification machinery to be easily reused for Catch * `Catch::Session::run()` now accepts `char const * const *`, allowing it to accept array of string literals (#1031, #1178) * The embedded version of Clara was bumped to v1.1.3 diff --git a/docs/tutorial.md b/docs/tutorial.md index 1f0b8ff2..d10cb70a 100644 --- a/docs/tutorial.md +++ b/docs/tutorial.md @@ -13,7 +13,7 @@ ## Getting Catch2 -The simplest way to get Catch2 is to download the latest [single header version](https://raw.githubusercontent.com/catchorg/Catch2/master/single_include/catch2/catch.hpp). The single header is generated by merging a set of individual headers but it is still just normal source code in a header file. +The simplest way to get Catch2 is to download the latest [single header version](https://raw.githubusercontent.com/catchorg/Catch2/v2.x/single_include/catch2/catch.hpp). The single header is generated by merging a set of individual headers but it is still just normal source code in a header file. Alternative ways of getting Catch2 include using your system package manager, or installing it using [its CMake package](cmake-integration.md#installing-catch2-from-git-repository).