TBR: Delete old scripts and README section now that new deploy is set up.
Change-Id: Ic10b3211627214ae2c1a0fdc54c5b3a9cff74eeb
diff --git a/README.md b/README.md
index 5536faa..4b8da47 100644
--- a/README.md
+++ b/README.md
@@ -48,35 +48,5 @@
more details on the deployment infrastructure see [this doc][deploy] and the
[infrastructure] repository.
-### Old Deploy
-
-TODO(nlacasse): Update this with the new deployment setup
-
-Build and deploy the web assets to staging:
-
- ./tools/deploy.sh web
-
-Build and deploy the shell client binaries to staging:
-
- ./tools/deploy.sh shell
-
-Build and deploy everything to staging:
-
- ./tools/deploy.sh all
-
-### Release
-
-Cutting a release does a deploy, and if the deploy is successful, tags the
-current commit with the version and pushes it to the veyron remote.
-
-Make sure you have added the veyron remote.
-
- git remote add veyron git@github.com:veyron/chat.git
-
-Run the release.sh script with the desired version. Version must be of the
-form "v1.2.3".
-
- ./tools/release.sh <version>
-
[deploy]: http://goo.gl/QfD4gl
[infrastructure]: https://vanadium.googlesource.com/infrastructure/+/master/nginx/README.md
diff --git a/tools/deploy.sh b/tools/deploy.sh
deleted file mode 100755
index 704e865..0000000
--- a/tools/deploy.sh
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/bin/bash
-
-# Builds and uploads web site assets and shell client binaries.
-# If you want to create a new release tag, use release.sh instead.
-
-# TODO(nlacasse): Make the deploy server location a parameter.
-
-source "${VEYRON_ROOT}/scripts/lib/shell.sh"
-
-trap at_exit INT TERM EXIT
-
-at_exit() {
- # Note: shell::at_exit unsets our trap, so it won't run again on exit.
- shell::at_exit
- shell::kill_child_processes
-}
-
-# Compile binary for host OS and push to staging.
-deploy_shell() {
- local -r OS=$(uname)
- if [[ $OS =~ "Darwin" ]]; then
- echo "Building for Darwin"
- ./tools/compile_client_shell.sh darwin
- elif [[ $OS =~ "Linux" ]]; then
- echo "Building for Linux"
- ./tools/compile_client_shell.sh linux
- else
- echo "Unknown OS: $OS"
- exit 1
- fi
-
- # Copy binaries to staging.v.io, and set the permissions so they can
- # be downloaded.
- rsync -avz --chmod=u+rwx,g+rx,o+rx clients/shell/bin/dist/* git@staging.v.io:/usr/share/nginx/chat/binaries
-}
-
-# Build and deploy the web assets.
-deploy_web() {
- git push staging master
-}
-
-usage() {
- echo "Usage `basename $0` <shell|web|all>"
- echo " shell: Compile and push shell binaries."
- echo " web: Compile and push web assets."
- echo " all: Compile and push shell binaries and web assets."
- exit 1
-}
-
-main() {
- # Make sure anything we deploy is built from scratch, just in case our
- # Makefile setup doesn't always rebuild things that it should (which has
- # happened in the past).
- make clean
- if [[ $# -ne 1 ]]; then
- usage
- elif [[ $1 == "all" ]]; then
- deploy_shell
- deploy_web
- elif [[ $1 == "shell" ]]; then
- deploy_shell
- elif [[ $1 == "web" ]]; then
- deploy_web
- else
- usage
- fi
- exit 0
-}
-
-main "$@"
diff --git a/tools/release.sh b/tools/release.sh
deleted file mode 100755
index 9202339..0000000
--- a/tools/release.sh
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/bin/bash
-
-# Deploys web site and shell client binaries, and tags release with version.
-
-source "${VEYRON_ROOT}/scripts/lib/shell.sh"
-
-trap at_exit INT TERM EXIT
-
-at_exit() {
- # Note: shell::at_exit unsets our trap, so it won't run again on exit.
- shell::at_exit
- shell::kill_child_processes
-}
-
-# Checks that local master branch has been merged into veyron upstream.
-check_branch_merged_to_veyron_remote() {
- git fetch --tags veyron master
- if [[ -n $(git diff --name-only remotes/veyron/master) ]]; then
- echo "Current branch contains changes that are not in veyron/master."
- echo "Please merge branch into veyron/master before releasing."
- exit 1
- fi
-}
-
-# Checks that remote named "veyron" exists.
-check_veyron_remote_exists() {
- git remote show veyron > /dev/null
- if [[ $? -ne 0 ]]; then
- echo "Branch 'veyron' does not exist."
- echo "Please run: git remote add veyron git@github.com:veyron/chat.git"
- exit 1
- fi
-}
-
-# Checks that version has semver format like "v1.2.3".
-check_valid_version() {
- if [[ ! $1 =~ ^v[[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+$ ]]; then
- usage
- fi
-}
-
-usage() {
- echo "Usage: `basename $0` <version>"
- echo "version must begin with 'v' followed by a semver version, e.g. v1.2.3"
- echo ""
- echo "Released versions are:"
- git tag -l -n1
- echo ""
- exit 1
-}
-
-main() {
- if [[ $# -ne 1 ]]; then
- usage
- fi
-
- check_veyron_remote_exists
- check_branch_merged_to_veyron_remote
- check_valid_version $1
-
- # Deploy first, to make sure it succeeds.
- ./tools/deploy.sh all
-
- # Tag release and push tags to veyron remote.
- # TODO(nlacasse): Make sure the version is higher than all other version tags.
- git tag -a $1 -m "Release $1"
- git push veyron master --tags
-}
-
-main "$@"
