Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/release-checklist.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Template to use for release PRs from `develop` to `master`
# Template to use for release PRs from `develop` to `stable`

PR for tracking changes for the x.x.x release. Target release date: **DOW MONTH DAY YEAR**.

Expand Down Expand Up @@ -35,7 +35,7 @@ PR for tracking changes for the x.x.x release. Target release date: **DOW MONTH
- [ ] Close the milestone
- [ ] Open a new milestone for the next release
- [ ] If any open PRs/issues which were milestoned for this release did not make it into the release, update their milestone.
- [ ] Fast-forward `develop` to be equal to `master`
- [ ] Fast-forward `develop` to be equal to `stable`

### Publicize

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/quicktest.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
name: Quicktest

on:
# Run on pushes, including merges, to all branches except `master`.
# Run on pushes, including merges, to all branches except `stable` and `develop`.
push:
branches-ignore:
- master
- stable
- develop
paths-ignore:
- '**.md'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
name: Test

on:
# Run on pushes to `master` and on all pull requests.
# Run on pushes to `stable` and `develop` and on all pull requests.
push:
branches:
- master
- stable
- develop
paths-ignore:
- '**.md'
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@ This initial alpha release contains the following utility classes:
* [`Variables`]: Utility functions for use when examining variables.


[Unreleased]: https://github.com/PHPCSStandards/PHPCSUtils/compare/1.0.0-alpha3...HEAD
[Unreleased]: https://github.com/PHPCSStandards/PHPCSUtils/compare/stable...HEAD
[1.0.0-alpha3]: https://github.com/PHPCSStandards/PHPCSUtils/compare/1.0.0-alpha2...1.0.0-alpha3
[1.0.0-alpha2]: https://github.com/PHPCSStandards/PHPCSUtils/compare/1.0.0-alpha1...1.0.0-alpha2

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
[![Coverage Status](https://coveralls.io/repos/github/PHPCSStandards/PHPCSUtils/badge.svg?branch=develop)](https://coveralls.io/github/PHPCSStandards/PHPCSUtils?branch=develop)

[![Docs Build Status](https://github.com/PHPCSStandards/PHPCSUtils/actions/workflows/ghpages.yml/badge.svg)][phpcsutils-web]
[![License: LGPLv3](https://poser.pugx.org/phpcsstandards/phpcsutils/license)](https://github.com/PHPCSStandards/PHPCSUtils/blob/master/LICENSE)
[![License: LGPLv3](https://poser.pugx.org/phpcsstandards/phpcsutils/license)](https://github.com/PHPCSStandards/PHPCSUtils/blob/stable/LICENSE)
![Awesome](https://img.shields.io/badge/awesome%3F-yes!-brightgreen.svg)

</div>
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "1.x-dev",
"dev-stable": "1.x-dev",
"dev-develop": "1.x-dev"
}
},
Expand Down