Skip to content

Commit

Permalink
Merge pull request #205 from saad-ali/removeversionizedocs
Browse files Browse the repository at this point in the history
Remove versionize-docs from branchff
  • Loading branch information
ixdy committed Nov 15, 2016
2 parents cbe7b04 + 12591ee commit 0f3568b
Showing 1 changed file with 1 addition and 9 deletions.
10 changes: 1 addition & 9 deletions branchff
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ PROG=${0##*/}
#+ DESCRIPTION
#+ $PROG fast forwards a K8s release branch to [master object] (defaults to
#+ HEAD and then prepares the branch as a K8s release branch:
#+ * build-tools/versionize-docs.sh <branch>
#+ * Run hack/update-all.sh to ensure compliance of generated files
#+
#+
Expand Down Expand Up @@ -138,17 +137,10 @@ logrun -s git merge -X ours $MASTER_OBJECT
logecho -n "update-all.sh: "
logrun -s hack/update-all.sh

# Redo the branching activities
logecho -n "Check/rerun versionize-docs.sh again: "
# TODO: remove once we don't support k8s versions with build/ anymore
build_dir=build-tools
[[ -d $build_dir ]] || build_dir=build
logrun -s $build_dir/versionize-docs.sh $RELEASE_BRANCH

if [[ -n "$(git status -s)" ]]; then
logecho -n "Commit changes: "
logrun git add -A
logrun -s git commit -am "versionize-docs.sh and update-all.sh." \
logrun -s git commit -am "update-all.sh." \
|| common::exit 1 "Exiting..."
fi

Expand Down

0 comments on commit 0f3568b

Please sign in to comment.