Repository: mahout Updated Branches: refs/heads/master 697eae12c -> 1e6584d78
[WEBSITE] Issues with build_site.sh Project: http://git-wip-us.apache.org/repos/asf/mahout/repo Commit: http://git-wip-us.apache.org/repos/asf/mahout/commit/1e6584d7 Tree: http://git-wip-us.apache.org/repos/asf/mahout/tree/1e6584d7 Diff: http://git-wip-us.apache.org/repos/asf/mahout/diff/1e6584d7 Branch: refs/heads/master Commit: 1e6584d78e8dc83c04fd1c29a8b01d7e63b6005d Parents: 697eae1 Author: Trevor a.k.a @rawkintrevo <[email protected]> Authored: Wed Nov 29 18:01:09 2017 -0600 Committer: Trevor a.k.a @rawkintrevo <[email protected]> Committed: Wed Nov 29 18:01:09 2017 -0600 ---------------------------------------------------------------------- website/build_site.sh | 4 ---- 1 file changed, 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mahout/blob/1e6584d7/website/build_site.sh ---------------------------------------------------------------------- diff --git a/website/build_site.sh b/website/build_site.sh index bd2bc09..2c7835c 100755 --- a/website/build_site.sh +++ b/website/build_site.sh @@ -18,8 +18,6 @@ export PATH=${GEM_HOME}/bin:$PATH (cd website/docs && bundle install --path ${GEM_HOME}) (cd website/docs && bundle) (cd website/docs && bundle exec jekyll build --destination $WORKDIR/docs/latest) -<<<<<<< HEAD - # Set env for docs MAHOUT_VERSION=0.13.0 @@ -32,7 +30,6 @@ tar -C $WORKDIR -xzf $WORKDIR/$DISTFILE apache-mahout-distribution-$MAHOUT_VERSI mkdir -p $WORKDIR/docs/$MAHOUT_VERSION/api mv $WORKDIR/apache-mahout-distribution-$MAHOUT_VERSION/docs $WORKDIR/docs/$MAHOUT_VERSION/api rm -f $WORKDIR/$DISTFILE -======= # Set env for docs MAHOUT_VERSION=0.13.0 @@ -49,7 +46,6 @@ if [ ! -d "$WORKDIR/docs/$MAHOUT_VERSION/api" ]; then rm -f $WORKDIR/$DISTFILE fi ->>>>>>> 200882a468a5d5f72a53744ed959d38b56984ddb git checkout asf-site git clean -f -d git pull origin asf-site
