summaryrefslogtreecommitdiff
path: root/script/release
diff options
context:
space:
mode:
Diffstat (limited to 'script/release')
-rwxr-xr-xscript/release/build-binaries10
-rwxr-xr-xscript/release/make-branch20
2 files changed, 8 insertions, 22 deletions
diff --git a/script/release/build-binaries b/script/release/build-binaries
index d076197c..9d4a606e 100755
--- a/script/release/build-binaries
+++ b/script/release/build-binaries
@@ -23,11 +23,6 @@ REPO=docker/compose
# Build the binaries
script/clean
script/build/linux
-# TODO: build osx binary
-# script/setup/osx
-# script/build/osx
-# TODO: build or fetch the windows binary
-echo "You need to build the osx/windows binaries, that step is not automated yet."
echo "Building the container distribution"
script/build/image $VERSION
@@ -35,3 +30,8 @@ script/build/image $VERSION
echo "Create a github release"
# TODO: script more of this https://developer.github.com/v3/repos/releases/
browser https://github.com/$REPO/releases/new
+
+echo "Don't forget to download the osx and windows binaries from appveyor/bintray\!"
+echo "https://dl.bintray.com/docker-compose/$BRANCH/"
+echo "https://ci.appveyor.com/project/docker/compose"
+echo
diff --git a/script/release/make-branch b/script/release/make-branch
index 86b4c9f6..7ccf3f05 100755
--- a/script/release/make-branch
+++ b/script/release/make-branch
@@ -82,20 +82,6 @@ $SHELL || true
git commit -a -m "Bump $VERSION" --signoff --no-verify
-echo "Push branch to user remote"
-GITHUB_USER=$USER
-USER_REMOTE="$(find_remote $GITHUB_USER/compose)"
-if [ -z "$USER_REMOTE" ]; then
- echo "$GITHUB_USER/compose not found"
- read -r -p "Enter the name of your GitHub fork (username/repo): " GITHUB_REPO
- # assumes there is already a user remote somewhere
- USER_REMOTE=$(find_remote $GITHUB_REPO)
-fi
-if [ -z "$USER_REMOTE" ]; then
- >&2 echo "No user remote found. You need to 'git push' your branch."
- exit 2
-fi
-
-
-git push $USER_REMOTE
-browser https://github.com/$REPO/compare/docker:release...$GITHUB_USER:$BRANCH?expand=1
+echo "Push branch to docker remote"
+git push $REMOTE
+browser https://github.com/$REPO/compare/docker:release...$BRANCH?expand=1