Merge pull request #499 from openforge/develop

Merge develop to staging

Author: Wholloran

.travis.yml

@@ -1,16 +1,21 @@
 language: node_js
+
 node_js:
 - 10.10.0
+
 branches:
   only:
   - develop
   - qa
   - staging
   - master
+
 before_script:
 - npm install -g firebase-tools
+
 script:
 - npm run build
+- npm run build:functions
 
 after_success:
 - npm run firebase:deploy

functions/src/index.ts

@@ -15,11 +15,11 @@ export const rebuildMaster = functions.https.onRequest((butterRequest, butterRes
             "Content-Type": "application/json",
             "Accept": "application/json",
             "Travis-API-Version": "3",
-            "Authorization": "token " + travisToken
+            "Authorization": `token ${travisToken}`
         }
       };
 
-    const body = '{"request": {"branch":"master"}}';
+    const body = `{"request": {"branch":"${functions.config().travis.rebuild_branch}"}}`;
 
     const travisRequest = https.request(options, (travisResponse: any) => {
 

package.json

@@ -8,6 +8,7 @@
   ],
   "scripts": {
     "build": "node scripts/get-butter.js && stencil build --prerender",
+    "build:functions": "cd functions && npm install && npm run build && cd ..",
     "cz": "git-cz",
     "dev": "node scripts/get-butter.js && sd concurrent \"stencil build --dev --watch --no-cache\" \"stencil-dev-server\" ",
     "lint": "tslint -p ./tsconfig.json --exclude '**/*.d.ts'",

scripts/deploy.js

@@ -9,28 +9,28 @@ var token = process.env.FIREBASE_TOKEN
 function deployToFirebase(project) {
     console.log('Deploying to firebase project openforge-'+project);
     if(project === 'dev'){
-        exec("firebase use default && firebase deploy --token " + token, function(error, stdout, stderr) {
-            console.log(error);
-            console.log(stdout);
-            console.log(stderr);
+        exec('firebase use default', function() {
+            exec('firebase functions:config:set travis.rebuild_branch="develop"', function() {
+                exec('firebase deploy --token ' + token);
+            });
         });
     } else if(project === 'qa') {
-        exec("firebase use qa && firebase deploy --token " + token, function(error, stdout, stderr) {
-            console.log(error);
-            console.log(stdout);
-            console.log(stderr);
+        exec('firebase use qa', function() {
+            exec('firebase functions:config:set travis.rebuild_branch="qa"', function() {
+                exec('firebase deploy --token ' + token);
+            });
         });
     } else if(project === 'staging') {
-        exec("firebase use staging && firebase deploy --token " + token, function(error, stdout, stderr) {
-            console.log(error);
-            console.log(stdout);
-            console.log(stderr);
+        exec('firebase use staging', function() {
+            exec('firebase functions:config:set travis.rebuild_branch="staging"', function() {
+                exec('firebase deploy --token ' + token);
+            });
         });
     } else if(project === 'prod') {
-        exec("firebase use production && firebase deploy --token " + token, function(error, stdout, stderr) {
-            console.log(error);
-            console.log(stdout);
-            console.log(stderr);
+        exec('firebase use production', function() {
+            exec('firebase functions:config:set travis.rebuild_branch="master"', function() {
+                exec('firebase deploy --token ' + token);
+            });
         });
     }
 }