From 3cc4abb0928893051a549e297430c5dd698d5394 Mon Sep 17 00:00:00 2001 From: Oliver Klee Date: Sat, 10 Oct 2020 14:02:59 +0200 Subject: [PATCH] [TASK] Switch the default branch from master to main (#117) Also update URLs to other repositories that also have done the switch. --- .github/workflows/ci.yml | 4 ++-- README.md | 6 +++--- composer.json | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 237357a..cb12f32 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,10 +3,10 @@ name: CI on: push: branches: - - master + - main pull_request: branches: - - master + - main jobs: php-lint: name: "PHP linter" diff --git a/README.md b/README.md index 3e84489..06d7ca9 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Tea example [![CI Status](https://github.com/TYPO3-Documentation/tea/workflows/CI/badge.svg)](https://github.com/TYPO3-Documentation/tea/actions) -[![Gitlab CI Status](https://gitlab.typo3.org/qa/example-extension/badges/master/pipeline.svg)](https://gitlab.typo3.org/qa/example-extension/-/pipelines) +[![Gitlab CI Status](https://gitlab.typo3.org/qa/example-extension/badges/main/pipeline.svg)](https://gitlab.typo3.org/qa/example-extension/-/pipelines) [![Latest Stable Version](https://poser.pugx.org/ttn/tea/v/stable.svg)](https://packagist.org/packages/ttn/tea) [![Total Downloads](https://poser.pugx.org/ttn/tea/downloads.svg)](https://packagist.org/packages/ttn/tea) [![Latest Unstable Version](https://poser.pugx.org/ttn/tea/v/unstable.svg)](https://packagist.org/packages/ttn/tea) @@ -11,7 +11,7 @@ This TYPO3 extension is an example for writing unit and functional tests for Extbase/Fluid-based extensions for TYPO3 CMS using PHPUnit. It also is an example for -[best practices for extbase/fluid](https://github.com/oliverklee/workshop-handouts/tree/master/extbase-best-practices). +[best practices for extbase/fluid](https://github.com/oliverklee/workshop-handouts/tree/main/extbase-best-practices). For information on the different ways to execute the tests, please have a look at the [handout to my workshops on test-driven development (TDD)](https://github.com/oliverklee/tdd-reader). @@ -91,7 +91,7 @@ Instead, the projects (i.e., for TYPO3 installations) need to have the security ## More Documentation * [Handout to my workshops on test-driven development (TDD)](https://github.com/oliverklee/tdd-reader) -* [Handout for best practices with extbase and fluid](https://github.com/oliverklee/workshop-handouts/blob/master/extbase-best-practices/extbase-best-practices.pdf) +* [Handout for best practices with extbase and fluid](https://github.com/oliverklee/workshop-handouts/blob/main/extbase-best-practices/extbase-best-practices.pdf) ## Other example projects diff --git a/composer.json b/composer.json index 2e4e8ec..9a10d9c 100644 --- a/composer.json +++ b/composer.json @@ -101,7 +101,7 @@ }, "extra": { "branch-alias": { - "dev-master": "2.0.x-dev" + "dev-main": "2.0.x-dev" }, "typo3/cms": { "extension-key": "tea",