Gruntfile: Fix overwriting of web page images.

This commit is contained in:
ccd0 2014-12-29 12:12:23 -08:00
parent 9302fed817
commit 0461c2607e

View File

@ -152,7 +152,7 @@ module.exports = (grunt) ->
git tag -af stable -m "<%= pkg.meta.name %> v<%= pkg.meta.version %>."
git checkout -b tmp
git merge --no-commit -s ours gh-pages
git checkout gh-pages "builds/*<%= pkg.meta.suffix.beta %>.*" README.md template.jst index.html
git checkout gh-pages "builds/*<%= pkg.meta.suffix.beta %>.*" README.md template.jst index.html img
git commit -am "Move <%= pkg.meta.name %> v<%= pkg.meta.version %> to stable channel."
git checkout gh-pages
git merge --ff-only tmp
@ -163,7 +163,7 @@ module.exports = (grunt) ->
command: """
git commit -am "Build web page."
git checkout gh-pages
git checkout - README.md template.jst index.html
git checkout - README.md template.jst index.html img
git commit -am "Update web page."
git checkout -
""".split('\n').join('&&')