Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
6967ae78
Unverified
Commit
6967ae78
authored
Jun 26, 2017
by
Jordan Liggitt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make doc generation on cherry-picks optional
parent
53a5ee79
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
3 deletions
+9
-3
cherry_pick_pull.sh
hack/cherry_pick_pull.sh
+9
-3
No files found.
hack/cherry_pick_pull.sh
View file @
6967ae78
...
@@ -29,6 +29,7 @@ cd "${KUBE_ROOT}"
...
@@ -29,6 +29,7 @@ cd "${KUBE_ROOT}"
declare
-r
STARTINGBRANCH
=
$(
git symbolic-ref
--short
HEAD
)
declare
-r
STARTINGBRANCH
=
$(
git symbolic-ref
--short
HEAD
)
declare
-r
REBASEMAGIC
=
"
${
KUBE_ROOT
}
/.git/rebase-apply"
declare
-r
REBASEMAGIC
=
"
${
KUBE_ROOT
}
/.git/rebase-apply"
DRY_RUN
=
${
DRY_RUN
:-
""
}
DRY_RUN
=
${
DRY_RUN
:-
""
}
REGENERATE_DOCS
=
${
REGENERATE_DOCS
:-
""
}
UPSTREAM_REMOTE
=
${
UPSTREAM_REMOTE
:-
upstream
}
UPSTREAM_REMOTE
=
${
UPSTREAM_REMOTE
:-
upstream
}
FORK_REMOTE
=
${
FORK_REMOTE
:-
origin
}
FORK_REMOTE
=
${
FORK_REMOTE
:-
origin
}
...
@@ -54,6 +55,9 @@ if [[ "$#" -lt 2 ]]; then
...
@@ -54,6 +55,9 @@ if [[ "$#" -lt 2 ]]; then
echo
" This is useful for creating patches to a release branch without making a PR."
echo
" This is useful for creating patches to a release branch without making a PR."
echo
" When DRY_RUN is set the script will leave you in a branch containing the commits you cherry-picked."
echo
" When DRY_RUN is set the script will leave you in a branch containing the commits you cherry-picked."
echo
echo
echo
" Set the REGENERATE_DOCS environment var to regenerate documentation for the target branch after picking the specified commits."
echo
" This is useful when picking commits containing changes to API documentation."
echo
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."
exit
2
exit
2
...
@@ -184,12 +188,14 @@ done
...
@@ -184,12 +188,14 @@ done
gitamcleanup
=
false
gitamcleanup
=
false
# Re-generate docs (if needed)
# Re-generate docs (if needed)
echo
if
[[
-n
"
${
REGENERATE_DOCS
}
"
]]
;
then
echo
"Regenerating docs..."
echo
if
!
hack/generate-docs.sh
;
then
echo
"Regenerating docs..."
if
!
hack/generate-docs.sh
;
then
echo
echo
echo
"hack/generate-docs.sh FAILED to complete."
echo
"hack/generate-docs.sh FAILED to complete."
exit
1
exit
1
fi
fi
fi
if
[[
-n
"
${
DRY_RUN
}
"
]]
;
then
if
[[
-n
"
${
DRY_RUN
}
"
]]
;
then
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment