Skip to content

Commit

Permalink
Change references to old default branch main to new default branch 2.x
Browse files Browse the repository at this point in the history
  • Loading branch information
greg-1-anderson committed Aug 31, 2020
1 parent cf58ea6 commit 3943056
Show file tree
Hide file tree
Showing 7 changed files with 85 additions and 85 deletions.
2 changes: 1 addition & 1 deletion .scenarios.lock/symfony4/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
},
"extra": {
"branch-alias": {
"dev-main": "2.x-dev"
"dev-2.x": "2.x-dev"
}
},
"suggest": {
Expand Down
66 changes: 33 additions & 33 deletions .scenarios.lock/symfony4/composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ dist: trusty
language: php

branches:
# Only test the main branch and SemVer tags.
# Only test the 2.x branch and SemVer tags.
only:
- main
- 2.x
- 1.x
- /^[[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+.*$/

Expand Down
10 changes: 5 additions & 5 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,14 @@ grasmash/expander 1.0.0 MIT
league/container 2.4.1 MIT
psr/container 1.0.0 MIT
psr/log 1.1.3 MIT
symfony/console v4.4.11 MIT
symfony/event-dispatcher v4.4.11 MIT
symfony/console v4.4.12 MIT
symfony/event-dispatcher v4.4.12 MIT
symfony/event-dispatcher-contracts v1.1.9 MIT
symfony/filesystem v4.4.11 MIT
symfony/finder v4.4.11 MIT
symfony/filesystem v4.4.12 MIT
symfony/finder v4.4.12 MIT
symfony/polyfill-ctype v1.18.1 MIT
symfony/polyfill-mbstring v1.18.1 MIT
symfony/polyfill-php73 v1.18.1 MIT
symfony/polyfill-php80 v1.18.1 MIT
symfony/process v4.4.11 MIT
symfony/process v4.4.12 MIT
symfony/service-contracts v1.1.9 MIT
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
[![Latest Unstable Version](https://poser.pugx.org/consolidation/robo/v/unstable.png)](https://packagist.org/packages/consolidation/robo)
[![Total Downloads](https://poser.pugx.org/consolidation/robo/downloads.png)](https://packagist.org/packages/consolidation/robo)

[![Build Status](https://travis-ci.org/consolidation/Robo.svg?branch=main)](https://travis-ci.org/consolidation/Robo)
[![Build Status](https://travis-ci.org/consolidation/Robo.svg?branch=2.x)](https://travis-ci.org/consolidation/Robo)
[![Windows CI](https://ci.appveyor.com/api/projects/status/0823hnh06pw8ir4d?svg=true)](https://ci.appveyor.com/project/greg-1-anderson/robo)
[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/consolidation/Robo/badges/quality-score.png?b=main)](https://scrutinizer-ci.com/g/consolidation/Robo/?branch=main)
[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/consolidation/Robo/badges/quality-score.png?b=2.x)](https://scrutinizer-ci.com/g/consolidation/Robo/?branch=2.x)
[![License](https://img.shields.io/badge/license-MIT-408677.svg)](LICENSE)

* writing cross-platform scripts
Expand All @@ -23,7 +23,7 @@

| Branch | Symfony Versions | PHP Versions |
| ------ | ---------------- | ------------ |
| [main](https://github.com/consolidation/robo) | 4 only | [![PHP 7 only](https://img.shields.io/badge/PHP%207-only-92a9ed)](https://travis-ci.org/consolidation/Robo) |
| [2.x](https://github.com/consolidation/robo) | 4 only | [![PHP 7 only](https://img.shields.io/badge/PHP%207-only-92a9ed)](https://travis-ci.org/consolidation/Robo) |
| [1.x](https://github.com/consolidation/robotree/1.x) | 2, 3 or 4 | [![PHP 5 supported](https://img.shields.io/badge/PHP%205-supported-408677)](https://travis-ci.org/consolidation/Robo) |

The pre-build [robo.phar](http://robo.li/robo.phar) is built with Symfony 5, and requires PHP 7.2+. Robo also works with Symfony 4 and PHP 7.1.3+ if packaged as a library in another application.
Expand Down Expand Up @@ -65,7 +65,7 @@ All protected methods in traits that start with `task` prefix are tasks and can

## Examples

The best way to learn Robo by example is to take a look into [its own RoboFile](https://github.com/consolidation/Robo/blob/main/RoboFile.php)
The best way to learn Robo by example is to take a look into [its own RoboFile](https://github.com/consolidation/Robo/blob/2.x/RoboFile.php)
or [RoboFile of Codeception project](https://github.com/Codeception/Codeception/blob/2.4/RoboFile.php). There are also some basic example commands in `examples/RoboFile.php`.

Here are some snippets from them:
Expand Down Expand Up @@ -186,4 +186,4 @@ Brought to you by [Consolidation Team](https://github.com/orgs/consolidation/peo

## License

[MIT](https://github.com/consolidation/Robo/blob/main/LICENSE)
[MIT](https://github.com/consolidation/Robo/blob/2.x/LICENSE)
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
}
},
"branch-alias": {
"dev-main": "2.x-dev"
"dev-2.x": "2.x-dev"
}
},
"suggest": {
Expand Down
Loading

0 comments on commit 3943056

Please sign in to comment.