diff --git a/dist b/dist index 41428814..33b75884 160000 --- a/dist +++ b/dist @@ -1 +1 @@ -Subproject commit 414288148f2c148a4ae4de51db4b29ad0dcbc6d1 +Subproject commit 33b7588497538d07a514b3be4cfe53e26fc366a4 diff --git a/gulpfile.js b/gulpfile.js index b605d517..2b6feccb 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -129,17 +129,17 @@ gulp.task('deploy:bump', function () { .pipe(gulp.dest('./')) }) -gulp.task('deploy', ['deploy:updateSubmodule', 'deploy:bump', 'deploy:build', 'deploy:copy'], function () { +gulp.task('deploy', ['test', 'deploy:updateSubmodule', 'deploy:bump', 'deploy:build', 'deploy:copy'], function () { return gulp.src('./package.json', {read: false}) .pipe(shell([ + 'standard', 'echo "Deploying version <%= getVersion(file.path) %>"', - 'cd ./dist/', - 'git add -A', - 'git commit -am "Deploy <%= getVersion(file.path) %>" -n', - 'git push', - 'git tag -a v<%= getVersion(file.path) %> -m "Release <%= getVersion(file.path) %>"', - 'git push origin --tags', - 'cd ..', + 'git pull', + 'cd ./dist/ && git add -A', + 'cd ./dist/ && git commit -am "Deploy <%= getVersion(file.path) %>" -n', + 'cd ./dist/ && git push', + 'cd ./dist/ && git tag -a v<%= getVersion(file.path) %> -m "Release <%= getVersion(file.path) %>"', + 'cd ./dist/ && git push origin --tags', 'git commit -am "Release <%= getVersion(file.path) %>" -n', 'git push' ], { diff --git a/package.json b/package.json index a8470c55..eb34c5fb 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "yjs", - "version": "0.6.22", + "version": "0.6.23", "description": "A framework for real-time p2p shared editing on arbitrary complex data types", "main": "y.js", "scripts": { @@ -16,6 +16,7 @@ "parser": "babel-eslint", "ignore": [ "build/**", + "dist/**", "./y.js", "./y.js.map" ]