Skip to content

Corrected keywords for deployment #584

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.

Sign up for GitHub

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
christianlupus merged 2 commits into from
Feb 14, 2021
Merged

Corrected keywords for deployment #584

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1989690
Corrected keywords for deployment
christianlupus Feb 14, 2021
32fd16a
Updated changelog
christianlupus Feb 14, 2021
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
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,8 @@
[#579](https://github.com/nextcloud/cookbook/pull/579) @christianlupus
- Added label to Dockerfile to be consistent with docker guidelines
[#582](https://github.com/nextcloud/cookbook/pull/582) @christianlupus
- Corrected jekyll documentation
[#584](https://github.com/nextcloud/cookbook/pull/584) @christianlupus

### Removed
- Removal of old contoller no longer in use
Expand Down
4 changes: 2 additions & 2 deletions docs/dev/deployment.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@ You have to put a keyword on a line in the commit message to select a version ty
| Keyword | Version type | Generated version |
|---|---|---|
| no keyword | patch version | 1.2.4 |
| `%MINOR_VERSION%` | minor version | 1.3.0 |
| `%MAJOR_VERSION%` | major version | 2.0.0 |
| `%MINOR%` | minor version | 1.3.0 |
| `%MAJOR%` | major version | 2.0.0 |

The automatic deployment action will take over once you push to the `stable` branch.
The following actions will take place after the merge:
Expand Down