karmada-io
/
karmada
mirror of https://github.com/karmada-io/karmada.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1230 from RainbowMango/pr_orgnize_docs 

Orgnize documents about cherry-picks
This commit is contained in:
karmada-bot 2022-01-10 14:58:52 +08:00 committed by GitHub
parent 6cb3e99cce 8c564f79b9
commit 27f5bc55c1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/README.md
View File

@ -20,7 +20,9 @@ Refer to [Installing Karmada](./installation/installation.md).
## Developer Guide ## Developer Guide
## Contribute ## Contributors
- [Cherry Pick Overview](./contributors/devel/cherry-picks.md)
## Reference ## Reference

2
docs/userguide/cherry-picks.md → docs/contributors/devel/cherry-picks.md
View File

@ -115,3 +115,5 @@ cherry pick.
## Cherry Picks for Unsupported Releases ## Cherry Picks for Unsupported Releases
The community supports & patches releases need to be discussed. 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

6
hack/cherry_pick_pull.sh
View File

@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # 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 # Checkout a PR from GitHub. (Yes, this is sitting in a Git tree. How
# meta.) Assumes you care about pulls from remote "upstream" and # 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 " Set UPSTREAM_REMOTE (default: upstream) and FORK_REMOTE (default: origin)"
echo " to override the default remote names to what you have locally." echo " to override the default remote names to what you have locally."
echo 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 exit 2
fi fi
@ -146,7 +146,7 @@ function make-a-pr() {
cat <<EOF cat <<EOF
Cherry pick of ${PULLSUBJ} on ${rel}. Cherry pick of ${PULLSUBJ} on ${rel}.
${numandtitle} ${numandtitle}
For details on the cherry pick process, see the [cherry pick requests](https://github.com/karmada-io/karmada/blob/master/docs/userguide/cherry-picks.md) page. For details on the cherry pick process, see the [cherry pick requests](https://github.com/karmada-io/karmada/blob/master/docs/contributors/devel/cherry-picks.md) page.
\`\`\`release-note \`\`\`release-note
\`\`\` \`\`\`
EOF EOF