tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-07-27 15:44:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2768 from aanand/fix-make-branch

Browse Source 
Fixes to make-branch script
This commit is contained in:
Daniel Nephin 2016-01-28 15:05:21 -05:00
commit 517d3a581c
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
script/release/make-branch
View File

@ -63,15 +63,17 @@ git merge --strategy=ours --no-edit $REMOTE/release
git config "branch.${BRANCH}.release" $VERSION git config "branch.${BRANCH}.release" $VERSION
editor=${EDITOR:-vim}
echo "Update versions in docs/install.md, compose/__init__.py, script/run.sh" echo "Update versions in docs/install.md, compose/__init__.py, script/run.sh"
$EDITOR docs/install.md $editor docs/install.md
$EDITOR compose/__init__.py $editor compose/__init__.py
$EDITOR script/run.sh $editor script/run.sh
echo "Write release notes in CHANGELOG.md" echo "Write release notes in CHANGELOG.md"
browser "https://github.com/docker/compose/issues?q=milestone%3A$VERSION+is%3Aclosed" browser "https://github.com/docker/compose/issues?q=milestone%3A$VERSION+is%3Aclosed"
$EDITOR CHANGELOG.md $editor CHANGELOG.md
git diff git diff
@ -84,10 +86,10 @@ echo "Push branch to user remote"
GITHUB_USER=$USER GITHUB_USER=$USER
USER_REMOTE="$(find_remote $GITHUB_USER/compose)" USER_REMOTE="$(find_remote $GITHUB_USER/compose)"
if [ -z "$USER_REMOTE" ]; then if [ -z "$USER_REMOTE" ]; then
echo "No user remote found for $GITHUB_USER" echo "$GITHUB_USER/compose not found"
read -r -p "Enter the name of your github user: " GITHUB_USER read -r -p "Enter the name of your GitHub fork (username/repo): " GITHUB_REPO
# assumes there is already a user remote somewhere # assumes there is already a user remote somewhere
USER_REMOTE=$(find_remote $GITHUB_USER/compose) USER_REMOTE=$(find_remote $GITHUB_REPO)
fi fi
if [ -z "$USER_REMOTE" ]; then if [ -z "$USER_REMOTE" ]; then
>&2 echo "No user remote found. You need to 'git push' your branch." >&2 echo "No user remote found. You need to 'git push' your branch."