From 8c564f79b95e87a9fdf9acc6175347881c7382b3 Mon Sep 17 00:00:00 2001 From: RainbowMango Date: Mon, 10 Jan 2022 11:02:11 +0800 Subject: [PATCH] Orgnize documents about cherry-picks Signed-off-by: RainbowMango --- docs/README.md | 4 +++- docs/{userguide => contributors/devel}/cherry-picks.md | 2 ++ hack/cherry_pick_pull.sh | 6 +++--- 3 files changed, 8 insertions(+), 4 deletions(-) rename docs/{userguide => contributors/devel}/cherry-picks.md (98%) diff --git a/docs/README.md b/docs/README.md index 15d77c073..8370e1e21 100644 --- a/docs/README.md +++ b/docs/README.md @@ -19,7 +19,9 @@ Refer to [Installing Karmada](./installation/installation.md). ## Developer Guide -## Contribute +## Contributors + +- [Cherry Pick Overview](./contributors/devel/cherry-picks.md) ## Reference diff --git a/docs/userguide/cherry-picks.md b/docs/contributors/devel/cherry-picks.md similarity index 98% rename from docs/userguide/cherry-picks.md rename to docs/contributors/devel/cherry-picks.md index 1d2e6ee4c..7c6c1c527 100644 --- a/docs/userguide/cherry-picks.md +++ b/docs/contributors/devel/cherry-picks.md @@ -115,3 +115,5 @@ cherry pick. ## Cherry Picks for Unsupported Releases The community supports & patches releases need to be discussed. + +[cherry-pick-script]: https://github.com/karmada-io/karmada/blob/master/hack/cherry_pick_pull.sh diff --git a/hack/cherry_pick_pull.sh b/hack/cherry_pick_pull.sh index e9c8a2c64..924acdac6 100755 --- a/hack/cherry_pick_pull.sh +++ b/hack/cherry_pick_pull.sh @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Usage Instructions: https://github.com/karmada-io/karmada/blob/master/docs/userguide/cherry-picks.md +# Usage Instructions: https://github.com/karmada-io/karmada/blob/master/docs/contributors/devel/cherry-picks.md # Checkout a PR from GitHub. (Yes, this is sitting in a Git tree. How # meta.) Assumes you care about pulls from remote "upstream" and @@ -64,7 +64,7 @@ if [[ "$#" -lt 2 ]]; then echo " Set UPSTREAM_REMOTE (default: upstream) and FORK_REMOTE (default: origin)" echo " to override the default remote names to what you have locally." echo - echo " For merge process info, see https://github.com/karmada-io/karmada/blob/master/docs/userguide/cherry-picks.md" + echo " For merge process info, see https://github.com/karmada-io/karmada/blob/master/docs/contributors/devel/cherry-picks.md" exit 2 fi @@ -146,7 +146,7 @@ function make-a-pr() { cat <