Goyslop/4chan-x
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

include template in webpage files

Browse Source
This commit is contained in:
ccd0 2014-09-29 04:02:31 -07:00
parent d72eada075
commit 38c2872ea9
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Gruntfile.coffee
View File

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