Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make sed command work in BSD and Linux. Don't double-test in dist-compile #3237

Merged
merged 1 commit into from
Feb 15, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ module.exports = function(grunt) {
grunt.registerTask("release:minor", ["bump:minor", "dist-compile", "gitcommit:version"]);
grunt.registerTask("release:major", ["bump:major", "dist-compile", "gitcommit:version"]);

grunt.registerTask("dist-compile", ["test", "exec:npm:sed-version", "uglify", "compress"]);
grunt.registerTask("dist-compile", ["exec:npm:build", "exec:npm:sed-version", "uglify", "compress"]);

grunt.registerTask("commitjs", ["dist-compile", "gitcommit:built"]);
grunt.registerTask("default", ["exec:npm:start"]);
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"build:webpack": "webpack --config webpack.config.js",
"check_version": "echo ${npm_package_version} $(npm view ${npm_package_name} version) | awk '{ if ($1 == $2) { exit 1 }}'",
"dist-compile": "grunt dist-compile",
"sed-version": "sed -i '' -e \"s/exports.version = __VERSION__/exports.version = \\\"${npm_package_version}\\\"/\" build/src/core/version.js",
"sed-version": "sed -i.bak -e \"s/exports.version = __VERSION__/exports.version = \\\"${npm_package_version}\\\"/\" build/src/core/version.js",
"start": "npm-run-all -p start:update-quicktests start:watch-tsc start:watch-quicktests start:webpack-dev-server",
"start:update-quicktests": "grunt update-quicktests",
"start:watch-quicktests": "grunt watch-quicktests",
Expand Down