Permalink
Browse files

updated release script, renamed release-staging to upgrade-staging, m…

…ove some deps to production scope
  • Loading branch information...
1 parent 3df8dbd commit 51c3210038719c998187c5342feddfca52b9dcea @outbounder outbounder committed Feb 27, 2014
Showing with 5 additions and 63 deletions.
  1. +3 −4 package.json
  2. +2 −59 scripts/release.js
  3. 0 scripts/{release-staging.js → upgrade-staging.js}
View
@@ -36,15 +36,14 @@
"passport": "0.1.17",
"passport-local": "0.1.6",
"errorface": "~0.1.0",
- "shelljs": "0.2.5"
+ "shelljs": "0.2.5",
+ "request": "2.22.0",
+ "backbone": "1.0.0"
},
"devDependencies": {
"jasmine-node": "1.11.0",
"jasmine-matchers": "0.2.2",
"Faker": "latest",
- "request": "2.22.0",
- "backbone": "1.0.0",
- "jquery": "1.8.3",
"nodemon": "0.7.8",
"wrench": "1.5.1",
"organic-angel": "~0.2.8",
View
@@ -1,62 +1,5 @@
require("shelljs/global");
-var async = require("async");
-
-var p = require("../package.json");
-var newVersion = p.version.split(".");
-newVersion[2] = (parseInt(newVersion[2])+1).toString();
-newVersion = newVersion.join(".");
-cd(__dirname+"/../");
-
-if(exec("git pull --ff").code != 0){
- echo("Error: failed to git pull");
- exit(1);
-}
-
-if(exec("git checkout master").code != 0){
- echo("Error: failed to checkout master");
- exit(1);
-}
-
-if(exec("git pull --ff origin master").code != 0){
- echo("Error: failed to pull origin master");
- exit(1);
-}
-
-if(exec("git merge develop").code != 0){
- echo("Error: failed to merge develop");
- exit(1);
-}
-
-
-// TODO find out how to trap errors from sed bellow
-sed('-i', '"version": "'+p.version+'"', '"version": "'+newVersion+'"', "package.json");
-
-if(exec("git add package.json").code != 0){
- echo("Error: failed to git add package.json");
- exit(1);
-}
-
-if(exec('git commit -am "'+newVersion+' release"').code != 0){
- echo("Error: failed to commit version bump");
- exit(1);
-}
-
-if(exec("git push").code != 0){
- echo("Error: failed to git push");
- exit(1);
-}
-
-if(exec("git checkout develop").code != 0){
- echo("Error: failed to git push");
- exit(1);
-}
-
-if(exec("git merge --ff master").code != 0){
- echo("Error: failed to merge master");
- exit(1);
-}
-
- if(exec("git push").code != 0){
- echo("Error: failed to push develop");
+if(exec("node ./node_modules/organic-angel/bin/angel git-release develop to origin at master").code != 0){
+ echo("Error: failed to upgrade staging");
exit(1);
}
File renamed without changes.

0 comments on commit 51c3210

Please sign in to comment.