From a41464686e5d27c66c219f7768cb39ee87fdcf4f Mon Sep 17 00:00:00 2001 From: Mier Mieraisan Date: Mon, 13 Sep 2021 15:41:56 +0100 Subject: [PATCH 1/2] Create ckp one --- README.md | 2 +- Sources/GeneratePR/CreatePRCommand.swift | 2 +- Sources/GeneratePR/Helper/CommandHelper.swift | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index a7ed3cc..f140f7a 100644 --- a/README.md +++ b/README.md @@ -43,7 +43,7 @@ gen-pr "title" "Mieraidihaimu/GeneratePR/issues/1" -e "no need to panic" --fix - then you can sit back and relex. -To learn more please use `--help` or visit `https://github.com/Mieraidihaimu/GeneratePR` +To learn more please use `gen-pr --help` or visit `https://github.com/Mieraidihaimu/GeneratePR` ## 🌝 Contribute diff --git a/Sources/GeneratePR/CreatePRCommand.swift b/Sources/GeneratePR/CreatePRCommand.swift index fcfdb4e..bae53eb 100644 --- a/Sources/GeneratePR/CreatePRCommand.swift +++ b/Sources/GeneratePR/CreatePRCommand.swift @@ -40,7 +40,7 @@ struct CreatePRCommand: ParsableCommand { @Flag(help: "The PR type: is it a feature or bug fix PR?. Default value is feature PR.") var type: PRType = .feature - @Argument(help: "Linked github issue path. For instance, in issue URL https://github.com/randomX/repoY/issues/1060, the `randomX/repoY/issues/1060` is the issue path") + @Argument(help: "Linked cookpad github issue id. For instance, in issue URL https://github.com/cookpad/product-delivery/issues/1060, the `1060` is the issue id") var issue: String @Flag(name: [.customLong("verbose"), .customShort("v")], help: "Show logs, information and non blocking messages.") diff --git a/Sources/GeneratePR/Helper/CommandHelper.swift b/Sources/GeneratePR/Helper/CommandHelper.swift index 81a1123..52f8034 100644 --- a/Sources/GeneratePR/Helper/CommandHelper.swift +++ b/Sources/GeneratePR/Helper/CommandHelper.swift @@ -12,7 +12,7 @@ struct CommandHelper { """ # Related links - close https://github.com/%1$@ + close https://github.com/cookpad/product-delivery/issues/%1$@ # Why? @@ -39,7 +39,7 @@ struct CommandHelper { """ # Related links - https://github.com/%1$@ + https://github.com/cookpad/product-delivery/issues/%1$@ # Why? From 199f5be5516ff42be5b7ca5fb09dd684ed3d4f04 Mon Sep 17 00:00:00 2001 From: Mier Mieraisan Date: Wed, 15 Sep 2021 12:36:56 +0100 Subject: [PATCH 2/2] Adjust default branch to Ckp default branch master --- Sources/GeneratePR/CreatePRCommand.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Sources/GeneratePR/CreatePRCommand.swift b/Sources/GeneratePR/CreatePRCommand.swift index bae53eb..6e3b381 100644 --- a/Sources/GeneratePR/CreatePRCommand.swift +++ b/Sources/GeneratePR/CreatePRCommand.swift @@ -35,7 +35,7 @@ struct CreatePRCommand: ParsableCommand { var extra: String? @Option(name: [.customLong("base-branch"), .customShort("b")], help: "The base branch which the pull requests will be open to, default is main") - var baseBranch: String = "main" + var baseBranch: String = "master" @Flag(help: "The PR type: is it a feature or bug fix PR?. Default value is feature PR.") var type: PRType = .feature