From 40b03e993c2f5fb9808eb89cb2f1a695d878173b Mon Sep 17 00:00:00 2001 From: Roman Hotsiy Date: Sun, 29 May 2016 20:47:38 +0300 Subject: [PATCH] Simplified deployment --- build/prepare_deploy.js | 20 ++++++-------------- build/tasks/copy-version.js | 10 ---------- package.json | 4 ++-- 3 files changed, 8 insertions(+), 26 deletions(-) delete mode 100644 build/tasks/copy-version.js diff --git a/build/prepare_deploy.js b/build/prepare_deploy.js index 74638103..31e7b3a8 100755 --- a/build/prepare_deploy.js +++ b/build/prepare_deploy.js @@ -5,28 +5,20 @@ require('shelljs/global'); var paths = require('./paths'); var path = require('path'); -// copy old releases -mkdir('-p', '.ghpages-tmp'); -cd('.ghpages-tmp'); - -// reset local changes before checkout -exec('git reset --hard'); -exec('git fetch origin gh-pages:gh-pages'); -exec('git checkout gh-pages'); -cp('-R', '../releases/*', '.'); -exec('git checkout @{-1}'); -cd('..'); +set('-e'); +set('-v'); // build exec('npm run build-dist'); cd('demo'); mkdir('-p', 'dist'); cp('-R', '../dist/*', './dist/'); -mkdir('-p', 'releases'); -cp('-R', '../.ghpages-tmp/*', './releases/'); cd('..'); + var version = 'v' + require(path.join(__dirname, '../package.json')).version + '/'; var versionDir = path.join(paths.releases, version); +var latestDir = path.join(paths.releases, 'latest/'); mkdir('-p', versionDir) +mkdir('-p', latestDir); cp(paths.redocBuilt + '.min.js', versionDir); -cp(paths.redocBuilt + '.min.js', path.join(paths.releases, 'latest/')); +cp(paths.redocBuilt + '.min.js', latestDir); diff --git a/build/tasks/copy-version.js b/build/tasks/copy-version.js deleted file mode 100644 index aaf93012..00000000 --- a/build/tasks/copy-version.js +++ /dev/null @@ -1,10 +0,0 @@ -var gulp = require('gulp'); -var path = require('path'); -var paths = require('../paths'); - -gulp.task('copy-version', function() { - var tag = 'v' + require(path.join(__dirname, '../../package.json')).version; - gulp.src(paths.redocBuilt + '.min.js') - .pipe(gulp.dest(path.join(paths.releases, tag))) - .pipe(gulp.dest(path.join(paths.releases, 'latest'))); -}); diff --git a/package.json b/package.json index 21a60c91..1f09a58a 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "branch-release": "git reset --hard && branch-release", "unit": "gulp test", "e2e": "gulp e2e --prod", - "deploy": "node ./build/prepare_deploy.js && deploy-to-gh-pages demo" + "deploy": "node ./build/prepare_deploy.js && deploy-to-gh-pages --update demo" }, "keywords": [ "OpenAPI", @@ -76,7 +76,7 @@ "branch-release": "^0.3.2", "browser-sync": "^2.10.1", "del": "^2.2.0", - "deploy-to-gh-pages": "^1.0.0", + "deploy-to-gh-pages": "^1.1.2", "gulp": "^3.9.1", "gulp-concat": "^2.6.0", "gulp-eslint": "^1.1.1",