inteligr8/alfresco-transform-core
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-transform-core.git synced 2025-05-26 17:24:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

ACS-2767 Switch to using [release} rather than [trigger release]

Browse Source 
Switch has been made in t-service (ATS) and AIS projects

[skip ci]
This commit is contained in:
alandavis 2022-04-13 14:29:05 +01:00
parent b415835178
commit fb2248c409
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
docs/build-and-release.md
View File

@ -20,9 +20,9 @@ Travis CI builds differ by branch:
> - alfresco/alfresco-libreoffice > - alfresco/alfresco-libreoffice
> - alfresco/alfresco-transform-misc > - alfresco/alfresco-transform-misc
> - alfresco/alfresco-transform-core-aio > - alfresco/alfresco-transform-core-aio
- if the commit message contains the `[trigger release]` tag, the builds will also - if the commit message contains the `[release]` tag, the builds will also
include the _Release_ stage; include the _Release_ stage;
- PR builds where the latest commit contains the `[trigger release]` tag will execute dry runs - PR builds where the latest commit contains the `[release]` tag will execute dry runs
of the release jobs (no artifacts will be published until the PR is actually merged). of the release jobs (no artifacts will be published until the PR is actually merged).
* `ATS-*` / `ACS-*` branches: * `ATS-*` / `ACS-*` branches:
- regular builds which include only the _Build_ and _Tests_ stages; - regular builds which include only the _Build_ and _Tests_ stages;
@ -45,20 +45,20 @@ maven command, i.e.
``` ```
3. Update the project's dependencies (remove the `-SNAPSHOT` suffixes - only for dependencies, not 3. Update the project's dependencies (remove the `-SNAPSHOT` suffixes - only for dependencies, not
for the local project version). for the local project version).
4. Create a new commit with the `[trigger release]` tag in its message. If no local changes have 4. Create a new commit with the `[release]` tag in its message. If no local changes have
been generated by steps (2) and (3), then an empty commit should be created - e.g. been generated by steps (2) and (3), then an empty commit should be created - e.g.
```bash ```bash
git commit --allow-empty -m "ATS-###: Release T-Core (T-Engines) #.##.# [trigger release]" git commit --allow-empty -m "ATS-###: Release T-Core (T-Engines) #.##.# [release]"
``` ```
> The location of the `[trigger release]` tag in the commit message is irrelevant. > The location of the `[release]` tag in the commit message is irrelevant.
> If for any reason your PR contains multiple commits, the commit with the `[trigger release]` > If for any reason your PR contains multiple commits, the commit with the `[release]`
tag should be the last (newest) one. This will trigger the Release dry runs. tag should be the last (newest) one. This will trigger the Release dry runs.
5. Open a new Pull Request from the `ATS-###_release_version` branch into the original 5. Open a new Pull Request from the `ATS-###_release_version` branch into the original
`master` / `SP/*` / `HF/*` branch and wait for a green build; the **Release** stage on the PR build `master` / `SP/*` / `HF/*` branch and wait for a green build; the **Release** stage on the PR build
will only execute a _Dry_Run_ of the release. will only execute a _Dry_Run_ of the release.
6. Once it is approved, merge the PR, preferably through the **Rebase and merge** option. If the 6. Once it is approved, merge the PR, preferably through the **Rebase and merge** option. If the
**Create a merge commit** (_Merge pull request_) or **Squash and merge** options are used, you **Create a merge commit** (_Merge pull request_) or **Squash and merge** options are used, you
need to ensure that the _commit message_ contains the `[trigger release]` tag (sub-string). need to ensure that the _commit message_ contains the `[release]` tag (sub-string).