fix(builds): correctly parse branch names with / included (closes #429)

bleenco · Oct 27, 2018 · e853c96 · e853c96
1 parent 932a83b
commit e853c96
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/src/api/config.ts b/src/api/config.ts
@@ -577,6 +577,7 @@ function checkBranches(branch: string, branches: { test: string[], ignore: strin
 function spawnGit(args: string[]): Promise<void> {
   return new Promise((resolve, reject) => {
     let git = spawn('git', args, { detached: true });
+    let err = '';
 
     git.stdout.on('data', data => {
       data = data.toString();
@@ -585,11 +586,13 @@ function spawnGit(args: string[]): Promise<void> {
       }
     });
 
+    git.stderr.on('data', data => err += data.toString());
+
     git.on('close', code => {
       if (code === 0) {
         resolve();
       } else {
-        reject(code);
+        reject(code + ': ' + err);
       }
     });
   });

diff --git a/src/api/process-manager.ts b/src/api/process-manager.ts
@@ -431,7 +431,7 @@ export function startBuild(data: any, buildConfig?: any): Promise<any> {
         } else {
           sha = data.data.after || data.data.sha;
           if (data.data && data.data.ref) {
-            branch = data.data.ref.split('/').pop();
+            branch = data.data.ref.replace('refs/heads/', '');
           }
         }
       } else if (isBitbucket) {

diff --git a/src/api/process.ts b/src/api/process.ts
@@ -76,7 +76,7 @@ export function startBuildProcess(
     let restoreCache: Observable<any> = empty();
     let saveCache: Observable<any> = empty();
     if (proc.repo_name && proc.branch && proc.cache) {
-      let cacheFile = `cache_${proc.repo_name.replace('/', '-')}_${proc.branch}.tgz`;
+      let cacheFile = `cache_${proc.repo_name.replace('/', '-')}_${proc.branch.replace('/', '-')}.tgz`;
       let cacheHostPath = getFilePath(`cache/${cacheFile}`);
       let cacheContainerPath = `/home/abstruse/${cacheFile}`;
       let copyRestoreCmd = [

diff --git a/src/api/webhooks.ts b/src/api/webhooks.ts
@@ -14,7 +14,6 @@ import {
   synchronizeGogsPullRequest
 } from './db/repository';
 import { startBuild } from './process-manager';
-import { writeJsonFile } from './fs';
 
 export let webhooks = express.Router();