Fixed bug in job merge

firecow · Jan 8, 2020 · c6157cf · c6157cf
1 parent a517c96
commit c6157cf
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/index.ts b/src/index.ts
@@ -19,7 +19,7 @@ const logger: winston.Logger = winston.createLogger({
     ],
 });
 
-const illigalJobName = ["image", "services", "stages", "pages", "types", "before_script", "default", "after_script", "variables", "cache", "include"];
+const illigalJobName = ["local_configuration", "image", "services", "stages", "pages", "types", "before_script", "default", "after_script", "variables", "cache", "include"];
 const argv = yargs.argv;
 const cwd = argv.cwd || process.cwd();
 

diff --git a/src/job.ts b/src/job.ts
@@ -53,7 +53,7 @@ export class Job {
         const beforeScripts = Job.getScriptLikeFromData(jobData, "before_script");
         this.beforeScripts = beforeScripts.length > 0 ? beforeScripts : this.beforeScripts;
 
-        const afterScripts = Job.getScriptLikeFromData(jobData, "before_script");
+        const afterScripts = Job.getScriptLikeFromData(jobData, "after_script");
         this.afterScripts = afterScripts.length > 0 ? afterScripts : this.afterScripts;
 
         this.allowFailure = dotProp.get<boolean>(jobData, "allow_failure") || this.allowFailure;