Skip to content

Commit

Permalink
updated bumpup to 0.3
Browse files Browse the repository at this point in the history
  • Loading branch information
mar10 committed Sep 15, 2013
1 parent 16d4e38 commit 8d41c53
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 20 deletions.
13 changes: 6 additions & 7 deletions Gruntfile.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

25 changes: 14 additions & 11 deletions Gruntfile_org.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,9 @@ module.exports = (grunt) ->
options:
dateformat: "YYYY-MM-DD HH:mm"
normalize: true
files: ["package.json", "bower.json", "fancytree.jquery.json"]
updateProps:
pkg: "package.json"
files: ["package.json", "bower.json", "*.jquery.json"]

checkrepo:
beforeBump:
Expand Down Expand Up @@ -280,8 +282,8 @@ module.exports = (grunt) ->

# Task for updating the pkg config property. Needs to be run after
# bumpup so the next tasks in queue can work with updated values.
grunt.registerTask "updatePkg", () ->
grunt.config.set "pkg", grunt.file.readJSON("package.json")
# grunt.registerTask "updatePkg", () ->
# grunt.config.set "pkg", grunt.file.readJSON("package.json")


grunt.registerTask "server", ["connect:demo"]
Expand All @@ -293,12 +295,12 @@ module.exports = (grunt) ->
# grunt.registerTask("makejsdoc", ["jsdoc"]
grunt.registerTask "travis", ["test"]
grunt.registerTask "default", ["test"]
grunt.registerTask "bump", [
"checkrepo:beforeBump"
"bumpup:build"
"updatePkg"
# "replace:bump"
]
# grunt.registerTask "bump", [
# "checkrepo:beforeBump"
# "bumpup:build"
# "updatePkg"
# # "replace:bump"
# ]
grunt.registerTask "build", [
"exec:tabfix"
"test"
Expand All @@ -311,12 +313,13 @@ module.exports = (grunt) ->
"uglify"
"qunit:build"
"compress:build"
# "clean:build"
]
grunt.registerTask "release", [
"bump"
"checkrepo:beforeRelease"
"build"
"tagrelease"
# "clean:build"
"bumpup:prerelease"
]
grunt.registerTask "upload", [
"build"
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"grunt-html": "~0.3.3",
"qunitjs": "1.x",
"grunt-docco2": "~0.1.1",
"grunt-bumpup": "~0.2.0",
"grunt-bumpup": "~0.3.1",
"grunt-tagrelease": "~0.2.0",
"grunt-contrib-clean": "~0.5.0",
"grunt-contrib-copy": "~0.4.1",
Expand All @@ -49,4 +49,4 @@
"scripts": {
"test": "grunt ci --verbose"
}
}
}

0 comments on commit 8d41c53

Please sign in to comment.