deploy script fix

.travis.yml

@@ -4,6 +4,7 @@ env:
   global:
     - secure: "wbBkk3ujOixgrplG1baLP6lgjFr6bw2eiOsNYAyfwU8SeSoc4qgp8bGttigHOTwnPfAreLMlnGkFdPF3f8v31AHj98mevHKNxvkeFiRjDc9bI3rEviFnbZMWbsw7svzTw3/D4K1xZuHc46IReOU8OJUaQaAP/VquZ8S0ZLDyUslBLZyhQNgVtp5VmOyHie/iI+KvkOVZfhun2wVa5LJgmJJPCFIcPGdlWTf77InxZohBM1rPBB16UE/gXkLUlrMjqnZWRem92cN+mqkU7xolzeeWKdzvbD6pD0swCS3xbiFfwy9pHgxfDDYdqbQIuFKoRIOeIcSuFm8LQv5kXvdRGLM/aiND34V5rETB+uK9HCh66uDY/lpTVTpY8DlddbTitpgq1on1LEeVPdgvA1MU3wkQD++lrDT4hdNTNCsUvdbocceSlqEmrKycRUJCI8Z9HTnkCTXCITNFEw0brYTgrHE2+KY7ul4CYc0Xu0dHmm6SBHvdU38HLi4MRR/78VVP9anrH1zVVKiLP95vdFrwrXBFGewYVVwv4QjFuwnQFDTCLEYUNctyOF3H8pTLLbY0DWMM1LVU6abHfb0tDYpRCffKJv4Wf9wOcTNCemtaGaxgOY6vcy1/SmpVHa9WQkfDMywZrolByEwflw0wP/yUVdDVfRt/JeAVh9m4EhiHTc4="
     - secure: "KwwThYC5XnQXlt0r3mUfV91N9+4CujoCzrfb9eBhvfTQL0yRofx75saXWhh/HNC8fYsf/3cPV3iASKlUXCw2MjYw7w7pzmbeeszBRkMJQHdDFqaTmDY167vv88Mddd90quanM8EEdCpjvrLLzgGpxQGQzVRZ7z0SmxJIEF/I58aAmC8hZ++5V/zAlwnhCbvs8ppJB7zTf3Ug4rSVr1/q52CK5f0ZVwX1TqOlzHv7KFO7IZV5DWmYHsClvcJbraAtBUa0otNTzr6dIHq8K22MWBULHCvp2JziZ06F3jjfPk7yB0K8Ia8gy73n+rXyW8aikBpCCdhmAjHOOpB5VBM5I2/O1XYJY0rS4v6OoYUcw9rnbGY4tYh/k0We0cKgatbz43k6gYqO9bkjZMqZk/jqieQ8JKwfRQxd2SEd6tViuIzB1p3KqNDcG+0xAjgAMBy6LR8RSDbZJcPJ8Jv1WIB3xxL3m8REzIW3Fm1/hlJ+J1WzebK6D7Ypf0BOrRIU/XObDlpoFf2qdI9RgC/U4EULwUmGqEMd8W3moeU49QHx9MzIz4CEo03OODlP+dgDLmlVsjgP8+/ONUGJC/uqd8TvsNres5IS+/N8V2deLNxyyNvMV1DvbH1ogYnViM51Kn+Jq3bXqj39lYWYVkDk8SE9LR4/gmxwhmDQzuN+uwXi47o="
+    - secure: "euDckCIzfWbvdH8YoSm9OMOt7bnEmeWqV9YApz/quRpqe+6RIvKYnFqhC0IpzJaS734sDroJA/ouDITExY8+uEDMg4mnHGHVVfYZSgVjo6tOcVHfWtE2OBLIJ//8DMs1092Q4HAKsKb0iJYDS3Wvk3noaaPHG/sM+Cdo4dsc1ITLcwsLdayrzoO0Mh0AVd1OcVWI8pigm8+io5nPuczje9YrsHVCwYx78jomdWQ8YjMYD+dPsv1qWz3hEpcqXkw3f++nPsNmO6N3dCsaL3zacAFv8BlXVJ/uDmDINlTghJpU4LVt8p21oSi6L9Hcg2SP8SJWuQYy/yiQy6or8dW6I7+B48S0ZxP0CkZ+oFJpkKKKYRixJNFVW4yonK8WW5MNC5hDZx6mCHdWMchYVOcqwk1Q2ga7S8eSdsuAsT2m0VmBSoNpNICcFPmt4dII3ykYTaVR9HWCkcLyTuMnRH8v5IfTRQIxoKS+WuaezmJHkwOj9KIy/uG0ED21nzQ4NL0rx/1VpJPOmRFmcCJPvb1PdS+z2VPWiaSAqFLPzRshOzFSV9OfqyXxT0fowcDxqu5iR9cfXvujMWnmvUjA/7Cil9k157/fwiE2kUXDSXarzFU2jNG0IeHpEd3GpcII3mD3i5BVKAD7qUoxFaIzq+S4R4JEZMUFpsDv65O+BO9drlI="
 
 language: node_js
 

src/repo_scripts/deploy.ts

@@ -18,7 +18,6 @@ import * as vsce from 'vsce';
 const githubOwnerId = 'matepek';
 const githubRepoId = 'vscode-catch2-test-adapter';
 const githubRepoFullId = githubOwnerId + '/' + githubRepoId;
-const githubDeployerMail = '[email protected]';
 const vscodeExtensionId = githubOwnerId + '-' + githubRepoId;
 
 
@@ -157,13 +156,19 @@ function gitCommitAndTag(info: Info) {
   console.log('Creating commit and signed tag');
 
   return Promise.resolve()
+      .then(() => {
+        assert.ok(process.env['TRAVIS_BRANCH'] != undefined);
+        const branch = process.env['TRAVIS_BRANCH']!;
+        return spawn('git', 'checkout', branch);
+      })
       .then(() => {
         return spawn(
             'git', 'config', '--local', 'user.name', 'deploy.js script');
       })
       .then(() => {
-        return spawn(
-            'git', 'config', '--local', 'user.email', githubDeployerMail);
+        const deployerMail =
+            process.env['DEPLOYER_MAIL'] || '[email protected]';
+        return spawn('git', 'config', '--local', 'user.email', deployerMail);
       })
       .then(() => {
         return spawn('git', 'status');
@@ -196,16 +201,11 @@ function gitCommitAndTag(info: Info) {
 function gitPush(info: Info) {
   console.log('Pushing to origin');
 
-  assert.ok(process.env['TRAVIS_BRANCH'] != undefined);
-  const branch = process.env['TRAVIS_BRANCH']!;
   assert.ok(process.env['GITHUB_API_KEY'] != undefined);
-  return spawn('git', 'checkout', branch)
-      .then(() => {
-        return spawn(
-            'git', 'push', '--follow-tags',
-            'https://' + githubOwnerId + ':' + process.env['GITHUB_API_KEY']! +
-                '@github.com/' + githubRepoFullId + '.git');
-      })
+  return spawn(
+             'git', 'push', '--follow-tags',
+             'https://' + githubOwnerId + ':' + process.env['GITHUB_API_KEY']! +
+                 '@github.com/' + githubRepoFullId + '.git')
       .then(() => {
         return info;
       });