Merge branch 'bstable'

This commit is contained in:
ccd0 2015-03-02 10:47:28 -08:00
commit b5180c11a8
2 changed files with 4 additions and 0 deletions

1
.gitattributes vendored
View File

@ -2,6 +2,7 @@
* text=auto * text=auto
builds/* -text builds/* -text
text eol=lf
# Custom for Visual Studio # Custom for Visual Studio
*.cs diff=csharp *.cs diff=csharp

View File

@ -143,6 +143,7 @@ module.exports = (grunt) ->
""".split('\n').join('&&') """.split('\n').join('&&')
beta: beta:
command: """ command: """
git fetch --tags
git tag -af beta -m "<%= pkg.meta.name %> v<%= pkg.meta.version %>." git tag -af beta -m "<%= pkg.meta.name %> v<%= pkg.meta.version %>."
git checkout gh-pages git checkout gh-pages
git pull git pull
@ -153,6 +154,7 @@ module.exports = (grunt) ->
""".split('\n').join('&&') """.split('\n').join('&&')
stable: stable:
command: """ command: """
git fetch --tags
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 gh-pages git checkout gh-pages
git pull git pull
@ -164,6 +166,7 @@ module.exports = (grunt) ->
""".split('\n').join('&&') """.split('\n').join('&&')
web: web:
command: """ command: """
git fetch --tags
git commit -am "Build web page." git commit -am "Build web page."
git checkout gh-pages git checkout gh-pages
git pull git pull