From a3164db1bfb77ac5f09d4883ed511de65cde2977 Mon Sep 17 00:00:00 2001 From: Ilya Dmitrichenko Date: Tue, 28 Apr 2015 10:54:11 +0100 Subject: [PATCH] Remove scripts for publishing to gh-pages --- bin/merge-into-gh-pages | 20 -------------------- bin/publish-gh-pages | 3 --- 2 files changed, 23 deletions(-) delete mode 100755 bin/merge-into-gh-pages delete mode 100755 bin/publish-gh-pages diff --git a/bin/merge-into-gh-pages b/bin/merge-into-gh-pages deleted file mode 100755 index 810fd3fd..00000000 --- a/bin/merge-into-gh-pages +++ /dev/null @@ -1,20 +0,0 @@ -#! /bin/bash -set -e - -# For info on why/how to use this script, see -# https://github.com/weaveworks/weave/wiki/WorkingOnWeave#working-on-docs - -MERGE_ARGS="-X subtree=site" - -merge_dir=$(mktemp -d -t weave-merge.XXXXXX)/weave -git clone -b gh-pages . $merge_dir - -pushd $merge_dir -git pull --ff-only git@github.com:weaveworks/weave gh-pages -git fetch origin master -git merge $MERGE_ARGS -e -m "Merge master into gh-pages" origin/master - -popd -git fetch $merge_dir gh-pages:gh-pages - -# rm -rf $merge_dir diff --git a/bin/publish-gh-pages b/bin/publish-gh-pages deleted file mode 100755 index 95622740..00000000 --- a/bin/publish-gh-pages +++ /dev/null @@ -1,3 +0,0 @@ -#! /bin/sh -set -e -git push git@github.com:weaveworks/weave gh-pages:gh-pages