Implemented default:before_script and default:after_script

firecow · Jan 11, 2020 · 08d864f · 08d864f
1 parent 73e518e
commit 08d864f
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/job.ts b/src/job.ts
@@ -30,8 +30,9 @@ export class Job {
         this.stage = jobData.stage || ".pre";
         this.scripts = [].concat(jobData.script || []);
 
-        this.beforeScripts = [].concat(jobData.before_script || globals.before_script || []);
-        this.afterScripts = [].concat(jobData.after_script || globals.after_script || []);
+        const ciDefault = globals.default || {};
+        this.beforeScripts = [].concat(jobData.before_script || ciDefault.before_script || globals.before_script || []);
+        this.afterScripts = [].concat(jobData.after_script || ciDefault.after_script || globals.after_script || []);
         this.allowFailure = jobData.allow_failure || false;
         this.variables = jobData.variables || {};
     }