[CLI]Update Integrate patch release (#237)

* Set base branch to the main app release branch

* Update checklist for integrating patch releases

* Update commadn readme

gbm-cli/cmd/release/README.md

@@ -50,6 +50,7 @@ go run main.go release integrate v1.107.0
 **Flags**
 - `-a`, `--android`: Only integrate Android
 - `-i`, `--ios`: Only integrate iOS
+- `-V` : Host app version (required for patch releases)
 - `-h`, `--help`: Command line help for `integrate` command
 
 ### status
@@ -59,5 +60,5 @@ Command used to check the status of any given release:
 **Usage**
 
 ```
-go run main.go release status 1.07.0 
+go run main.go release status 1.07.0
 ```

gbm-cli/cmd/release/integrate.go

@@ -16,6 +16,7 @@ import (
 )
 
 var android, ios, both bool
+var hostVersion string
 
 var IntegrateCmd = &cobra.Command{
 	Use:   "integrate",
@@ -39,6 +40,13 @@ var IntegrateCmd = &cobra.Command{
 			GbmPr:      gbmPr,
 		}
 
+		if semver.IsPatchRelease() {
+			if hostVersion == "" {
+				exitIfError(errors.New("host version is required for patch releases"), 1)
+			}
+			ri.BaseBranch = fmt.Sprintf("release/%s", hostVersion)
+		}
+
 		results := []gh.PullRequest{}
 
 		createAndroidPr := func() {
@@ -113,4 +121,5 @@ func init() {
 	tempDir = workspace.Dir()
 	IntegrateCmd.Flags().BoolVarP(&android, "android", "a", false, "Only integrate Android")
 	IntegrateCmd.Flags().BoolVarP(&ios, "ios", "i", false, "Only integrate iOS")
+	IntegrateCmd.Flags().StringVarP(&hostVersion, "host-version", "V", "", "host app version")
 }

gbm-cli/templates/checklist/checklist.html

@@ -44,8 +44,13 @@ <h3>Create the Release{{ if .Scheduled }} (Thursday) {{end}}</h3>
 {{ Task `Create the Gutenberg and Gutenberg Mobile release PR by running:
   <pre>$ gbm-cli release prepare all %s</pre>` .Version }}
 
+{{ if .Scheduled}}
 {{ Task `After the CI tasks succeed, create the WordPress-iOS and WordPress-Android integration PRs by running:
   <pre>$ gbm-cli release integrate %s</pre>` .Version }}
+{{ else }}
+{{ Task `After the CI tasks succeed, create the WordPress-iOS and WordPress-Android integration PRs by running:
+  <pre>$ gbm-cli release integrate %s -V </pre>` .Version .HostVersion}}
+{{ end }}
 
 {{ if .Scheduled }}
 <!-- wp:group -->