Skip to content

Document process for bumping dev-master branch-alias and bump to 1.10-dev #852

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 7, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 31 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,37 @@ repository:
informational log messages with the `--level warning` option.
* Generated documentation may be found in the `build/master/html` directory.

## Creating a maintenance branch and updating master branch alias

After releasing a new major or minor version (e.g. 1.9.0), a maintenance branch
(e.g. v1.9) should be created. Any development towards a patch release (e.g.
1.9.1) would then be done within that branch and any development for the next
major or minor release can continue in master.

After creating a maintenance branch, the `extra.branch-alias.dev-master` field
in the master branch's `composer.json` file should be updated. For example,
after branching v1.9, `composer.json` in the master branch may still read:

```
"branch-alias": {
"dev-master": "1.9.x-dev"
}
```

The above would be changed to:

```
"branch-alias": {
"dev-master": "1.10.x-dev"
}
```

Commit this change:

```
$ git commit -m "Master is now 1.10-dev" composer.json
```

## Releasing

The follow steps outline the release process for a maintenance branch (e.g.
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "1.9.x-dev"
"dev-master": "1.10.x-dev"
}
}
}