Repository: incubator-livy-website Updated Branches: refs/heads/master 6bfc46b51 -> f93a37263
[MINOR] Updated publish script Made the publish script executable and updated it to pull from and push to apache rather than origin This makes more sense since only committers will be publishing and only to the apache repo Author: Alex Bozarth <ajboz...@us.ibm.com> Closes #12 from ajbozarth/publish. Project: http://git-wip-us.apache.org/repos/asf/incubator-livy-website/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-livy-website/commit/f93a3726 Tree: http://git-wip-us.apache.org/repos/asf/incubator-livy-website/tree/f93a3726 Diff: http://git-wip-us.apache.org/repos/asf/incubator-livy-website/diff/f93a3726 Branch: refs/heads/master Commit: f93a37263afed9ed81aee3fb989d1d7456cf8c53 Parents: 6bfc46b Author: Alex Bozarth <ajboz...@us.ibm.com> Authored: Thu Nov 30 10:51:59 2017 -0800 Committer: Alex Bozarth <ajboz...@us.ibm.com> Committed: Thu Nov 30 10:51:59 2017 -0800 ---------------------------------------------------------------------- README.md | 4 +++- publish.sh | 5 ++--- 2 files changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-livy-website/blob/f93a3726/README.md ---------------------------------------------------------------------- diff --git a/README.md b/README.md index affe933..be88f33 100644 --- a/README.md +++ b/README.md @@ -57,12 +57,14 @@ and the live website content is stored in the asf-site git branch. To publish new contents to the website, commit your changes to master, and use the 'publish.sh' shell script. +This assumes an upstream name of apache and committer privileges. + ``` 1. Make your changes 2. git commit -a -m "My updates" 3. git push 4. ./publish.sh -5. git push origin asf-site +5. git push apache asf-site ``` Within a few minutes, gitpubsub should kick in and you'll be able to see the results at http://git-wip-us.apache.org/repos/asf/incubator-livy-website/blob/f93a3726/publish.sh ---------------------------------------------------------------------- diff --git a/publish.sh b/publish.sh old mode 100644 new mode 100755 index cb563c5..10ff109 --- a/publish.sh +++ b/publish.sh @@ -22,8 +22,7 @@ bundle exec jekyll clean bundle exec jekyll build -d _site COMMIT_HASH=`git rev-parse HEAD` cd .. -git checkout asf-site -git branch --set-upstream-to=origin/asf-site asf-site +git checkout -B asf-site apache/asf-site git pull --rebase rm -rf content mkdir content @@ -34,7 +33,7 @@ git commit -a -m "Publishing from $COMMIT_HASH" echo "> > >" echo " " echo "You are now on the asf-site branch" -echo "Run git push origin asf-site to update the live site." +echo "Run git push apache asf-site to update the live site." echo " " echo " " set +e
