Merge pull request #39 from Glimpse/mkaufman-include-dev-build-in-rel…

…ease

Updating hud.zip archive to include both dev & prod builds

.travis.yml

@@ -7,14 +7,14 @@ install:
 - typings install
 script:
 - gulp clean
-- gulp archive-dev
-- gulp archive-prod
+- gulp build-dev
+- gulp build-prod
+- gulp archive
 deploy:
   provider: releases
   api_key:
     secure: G8FGj5OKTeieZEV1Pod1FXYq2lgEN75pHtxP9KW8C/LFzPPXJt0VJFFjKo+y+eKs5DF1+PypVAqYsGQN2cOq/ywCN34KZBLDagZ01BAvTEQKb0/JRhku3Fr7qQ+eI+HGpO2ke6AiI1tiMZc3glV96sZ4o/seZs+N6a2SceeldL3iw+lDGrUNsQlfz/yZGCLtSbiZHhDYwEwniLzd7rAYmeXZmib3kua+knEiYtJ0Sm7ylnUu3iCLRosjBfz6n0s/RrQmqZka4AONXt2ApJ4iB3bJoSvSmu+v3r1ymFwjta7x7RcfvAV4h01RfjocGblWjvwqBmKpjPB0Zt0RXDs+RwjDgxJ+bTzLUKP9pBBeATS866wjt1HBybKI8eUIJNS5tq/ALHTnh8eQ/YGAgZoeozR4g6PFIuVXlRJFL+fTpbBxSgbS/+WdCbmum/9Jgu1rWgTauOXAV1dZgswFENtqzjIKGqgnPeLivUya8cot7ug1RG2cyBg4gs76h3iG4XqZZLeN9XX9e3THxT0eJ/mGnuhtENgljkwhL63l51o3aVm/up5Ph4FwWhE+cGyUnUceN6LTgiJWh/m8frzOVykElyFfgbF22BfDoyD8Whkgh2h8BTe/rNXlLcAmiN3BCdN2GlfydRrWNlRZgi5OaSZo24XIjlRb84m5uAUt3NbDlGY=
   file: 
-  - .archive/prod/hud.zip
-  - .archive/dev/hud-dev.zip
+  - .archive/hud.zip
   on:
     tags: true

gulpfile.js

@@ -12,7 +12,6 @@ var gif = require('gulp-if');
 // var filelog = require('gulp-filelog');  // NOTE: Used for debug
 var runSequence = require('run-sequence');
 var zip = require('gulp-zip');
-var gulpRename = require('gulp-rename');
 
 var settings = {
     index: __dirname + '/src/index.html',
@@ -21,8 +20,6 @@ var settings = {
     outputDev: __dirname + '/.dist/dev',
     outputProd: __dirname + '/.dist/prod',
     archive: __dirname + '/.archive',
-    archiveDev: __dirname + '/.archive/dev',
-    archiveProd: __dirname + '/.archive/prod',
     assets: __dirname + '/assets/**/*'
 };
 
@@ -152,18 +149,12 @@ gulp.task('prod', function (cb) {
     runSequence('build-prod', 'server', cb);
 });
 
-gulp.task('archive-dev', ['build-dev'], function () {
-    return gulp.src(['.dist/dev/**'])
+// Note there's a race condition if we have build-dev & build-prod run as dependent tasks of archive.
+// those need to be run as seperate steps.
+gulp.task('archive', function () {
+    return gulp.src(['.dist/**'])
         .pipe(zip('hud.zip'))
-        .pipe(gulp.dest('.archive/dev'))
-        .pipe(gulpRename('hud-dev.zip'))
-        .pipe(gulp.dest('.archive/dev'));
-});
-
-gulp.task('archive-prod', ['build-prod'], function () {
-    return gulp.src(['.dist/prod/**'])
-        .pipe(zip('hud.zip'))
-        .pipe(gulp.dest('.archive/prod'));
+        .pipe(gulp.dest('.archive'));
 });
 
 gulp.task('default', ['dev']);

package.json

@@ -33,7 +33,6 @@
     "gulp": "^3.9.1",
     "gulp-if": "2.0.2",
     "gulp-minify-html": "1.0.6",
-    "gulp-rename": "^1.2.2",
     "gulp-util": "3.0.8",
     "gulp-zip": "^4.0.0",
     "imports-loader": "0.7.1",