Skip to content

brainfood / videojs-contrib-hls

Go to a project
Toggle navigation
Toggle navigation pinning
83073c71 by David LaPalomento
Options

Update contrib release task 

Remove video.js specific tasks. Add release-related grunt task configs.
1 parent 3acc3664
Inline Side-by-side
Showing 3 changed files with 14 additions and 29 deletions
...@@ -113,6 +113,11 @@ module.exports = function(grunt) { ...@@ -113,6 +113,11 @@ module.exports = function(grunt) {
113 } 113 }
114 } 114 }
115 }, 115 },
116 version: {
117 project: {
118 src: ['package.json']
119 }
120 },
116 karma: { 121 karma: {
117 options: { 122 options: {
118 frameworks: ['qunit'] 123 frameworks: ['qunit']
...@@ -205,6 +210,8 @@ module.exports = function(grunt) { ...@@ -205,6 +210,8 @@ module.exports = function(grunt) {
205 grunt.loadNpmTasks('grunt-open'); 210 grunt.loadNpmTasks('grunt-open');
206 grunt.loadNpmTasks('grunt-concurrent'); 211 grunt.loadNpmTasks('grunt-concurrent');
207 grunt.loadNpmTasks('grunt-contrib-watch'); 212 grunt.loadNpmTasks('grunt-contrib-watch');
213 grunt.loadNpmTasks('grunt-github-releaser');
214 grunt.loadNpmTasks('grunt-version');
208 grunt.loadNpmTasks('chg'); 215 grunt.loadNpmTasks('chg');
209 216
210 217
......
...@@ -198,30 +198,6 @@ ...@@ -198,30 +198,6 @@
198 "release_type": "minor", 198 "release_type": "minor",
199 "steps": [{ "include": "release run" }] 199 "steps": [{ "include": "release run" }]
200 }, 200 },
201 "prerelease": {
202 "release_type": "prerelease",
203 "steps": [
204 [ "git checkout master", "Checkout the development branch" ],
205 [ "git pull upstream master", "Update the development branch" ],
206 { "include": "branch check" },
207 [ "git checkout -b temp-release-branch master","Create a temporary branch for the dist" ],
208 [ "grunt version:{{release_type}}", "Bump package versions" ],
209 [ "./build/bin/version", "Return the current VJS Version from the package.json file", "version" ],
210 [ "git commit -am 'v{{version}}'", "Add and commit the package changes" ],
211 [ "git checkout master", "Checkout the developmet branch" ],
212 [ "git merge temp-release-branch", "Merge package changes into the dev brach" ],
213 [ "git push upstream master", "Push the dev branch changes to the repo" ],
214 [ "git checkout temp-release-branch", "Checkout the temp branch again" ],
215 [ "grunt dist", "Build the dist" ],
216 [ "git add dist --force", "Add the (otherwise ignored) release files" ],
217 [ "git commit -m 'v{{version}} dist'", "Commit the dist changes" ],
218 [ "git tag -a v{{version}} -m 'v{{version}}'", "Tag the release" ],
219 [ "git push upstream --tags", "Push the new tag to the repo" ],
220 [ "npm publish --tag next", "Publish to npm as 'next'" ],
221 [ "git checkout master", "Checkout the developmet branch" ],
222 [ "git branch -D temp-release-branch", "Delete the temp release branch" ]
223 ]
224 },
225 "run": { 201 "run": {
226 "steps": [ 202 "steps": [
227 { "include": "branch check" }, 203 { "include": "branch check" },
...@@ -229,15 +205,15 @@ ...@@ -229,15 +205,15 @@
229 [ "git pull upstream master", "Update the release branch" ], 205 [ "git pull upstream master", "Update the release branch" ],
230 [ "npm install", "Ensure dependency updates have been installed" ], 206 [ "npm install", "Ensure dependency updates have been installed" ],
231 [ "grunt test", "Run tests" ], 207 [ "grunt test", "Run tests" ],
232 [ "grunt version:{{ release_type }}", "Bump package versions" ], 208
233 [ "./build/bin/version", "Return the current VJS Version from the package.json file", "version" ], 209 [ "grunt version::{{ release_type }}", "Bump package versions" ],
210 [ "node -e \"console.log(require('./package.json').version)\"", "Return the current version from the package.json file", "version" ],
234 [ "grunt chg-release:{{ version }}", "Update the changelog with the new release" ], 211 [ "grunt chg-release:{{ version }}", "Update the changelog with the new release" ],
235 [ "grunt clean:dist", "Clean out the dist folder before the build" ], 212 [ "grunt clean", "Clean out old artifacts before the build" ],
236 [ "grunt", "Build the release" ], 213 [ "grunt", "Build the release" ],
237 [ "grunt vjsdocs", "Rebuild the docs" ],
238 [ "grunt cdn-links", "Update the cdn urls in the docs" ],
239 [ "git commit -am 'Release v{{ version }}'", "Commit the unstaged changes (package.json, changelog, etc)" ], 214 [ "git commit -am 'Release v{{ version }}'", "Commit the unstaged changes (package.json, changelog, etc)" ],
240 [ "git tag -a v{{version}} -m 'v{{version}}'", "Tag the current version" ], 215 [ "git tag -a v{{version}} -m 'v{{version}}'", "Tag the current version" ],
216
241 [ "git push upstream master", "Push changes to the remote" ], 217 [ "git push upstream master", "Push changes to the remote" ],
242 [ "git push upstream --tags", "Push tags to the remote" ], 218 [ "git push upstream --tags", "Push tags to the remote" ],
243 [ "npm publish", "Publish to npm" ], 219 [ "npm publish", "Publish to npm" ],
......
...@@ -27,9 +27,11 @@ ...@@ -27,9 +27,11 @@
27 "grunt-contrib-jshint": "~0.6.0", 27 "grunt-contrib-jshint": "~0.6.0",
28 "grunt-contrib-uglify": "~0.2.0", 28 "grunt-contrib-uglify": "~0.2.0",
29 "grunt-contrib-watch": "~0.4.0", 29 "grunt-contrib-watch": "~0.4.0",
30 "grunt-github-releaser": "^0.1.17",
30 "grunt-karma": "~0.6.2", 31 "grunt-karma": "~0.6.2",
31 "grunt-open": "0.2.3", 32 "grunt-open": "0.2.3",
32 "grunt-shell": "0.6.1", 33 "grunt-shell": "0.6.1",
34 "grunt-version": "^1.0.0",
33 "karma": "~0.10.0", 35 "karma": "~0.10.0",
34 "karma-chrome-launcher": "~0.1.2", 36 "karma-chrome-launcher": "~0.1.2",
35 "karma-firefox-launcher": "~0.1.3", 37 "karma-firefox-launcher": "~0.1.3",
......