Skip to content

Commit d37c998

Browse files
authored
Merge pull request #1311 from wordpress-mobile/update/use-inclusive-language
Update Release Process documentation
2 parents 8d4ecd6 + 2748a54 commit d37c998

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

Documentation/ReleaseProcess.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ The branch structure in Aztec iOS is based on the [Git Flow](https://nvie.com/po
66

77
These are the main branches involved in the release process:
88
```
9-
master: Kept up to date with the latest release.
9+
trunk: Kept up to date with the latest release.
1010
develop: Bleeding edge branch with all of the latest changes.
1111
release/x.y.z: Version branch, which we will use during the release process.
1212
```
@@ -29,7 +29,7 @@ WordPress-Aztec-iOS.podspec
2929
WordPress-Editor-iOS.podespec
3030
```
3131

32-
Open a PR on github where you target the `master` branch with the `release/x.y.z` branch and call it `Release x.y.z`
32+
Open a PR on github where you target the `trunk` branch with the `release/x.y.z` branch and call it `Release x.y.z`
3333

3434

3535
### Step 2: Testing the Integration ###
@@ -49,21 +49,21 @@ The things we want to look out for are:
4949

5050
### Step 3: Merge the branch ###
5151

52-
If the release PR is approved and all is working correctly in WP-iOS merge the release branch to master.
52+
If the release PR is approved and all is working correctly in WP-iOS merge the release branch to trunk.
5353

5454
### Step 4: Push the POD. ###
5555

5656
*Automated Process*
5757

58-
Create a new release on Github targetting the master branch and name it `Release x.y.z`
58+
Create a new release on Github targetting the trunk branch and name it `Release x.y.z`
5959

6060
Set a tag with the value `x.y.z` .
6161

6262
On the description field and the content of the changelog for this version
6363

6464
Press the `Publish release` button
6565

66-
At this moment the CI automation should notice your tag and after some minutes you should get the new pod publish on CocoaPods master trunk.
66+
At this moment the CI automation should notice your tag and after some minutes you should get the new pod publish on CocoaPods.
6767

6868
If this for some reason fails chech the manual process bellow
6969

@@ -103,10 +103,10 @@ Once renamed, you can create a new “Next Stable” milestone and assign all pe
103103

104104
At this point you’re ready to close the version milestone in GitHub.
105105

106-
### Step 6: Merge Master to develop ###
106+
### Step 6: Merge Trunk to develop ###
107107

108-
Following the git Flow methodology you now need to merge the master branch back to develop.
108+
Following the git Flow methodology you now need to merge the trunk branch back to develop.
109109

110-
Create a new PR in GitHub that targets `develop` with the master branch.
110+
Create a new PR in GitHub that targets `develop` with the trunk branch.
111111

112112
After review, if all is ok, merge that PR and your work is done.

0 commit comments

Comments
 (0)