fix: make fileVariables accessible at an earlier stage (#1341)

Author: ANGkeith

src/job.ts

@@ -153,7 +153,8 @@ export class Job {
         }
 
         const matrixVariables = opt.matrixVariables ?? {};
-        this._variables = {...globalVariables, ...jobVariables, ...matrixVariables, ...predefinedVariables, ...argvVariables};
+        const fileVariables = Utils.findEnvMatchedVariables(variablesFromFiles, this.fileVariablesDir);
+        this._variables = {...globalVariables, ...jobVariables, ...matrixVariables, ...predefinedVariables, ...fileVariables, ...argvVariables};
 
         let ciProjectDir = `${cwd}`;
         if (this.jobData["image"]) {

tests/test-cases/project-variables-file/.gitlab-ci-issue-1333.yml

@@ -0,0 +1,6 @@
+---
+issue-1333:
+  script:
+    - echo "$API_KEY"
+  environment:
+    name: $CUSTOM_VAR

tests/test-cases/project-variables-file/.gitlab-ci-local-variables.yml

@@ -14,3 +14,9 @@ FUNNY2:
 FUNNY3:
   values:
     "*": Recursive CI/CD
+
+CUSTOM_VAR: prod
+
+API_KEY:
+  values:
+    "prod": firecow

tests/test-cases/project-variables-file/integration.project-variables-file.test.ts

@@ -21,3 +21,16 @@ test.concurrent("project-variables-file <test-job>", async () => {
     ];
     expect(writeStreams.stdoutLines).toEqual(expect.arrayContaining(expected));
 });
+
+test.concurrent("project-variables-file <issue-1333>", async () => {
+    const writeStreams = new WriteStreamsMock();
+    await handler({
+        cwd: "tests/test-cases/project-variables-file",
+        file: ".gitlab-ci-issue-1333.yml",
+    }, writeStreams);
+
+    const expected = [
+        chalk`{blueBright issue-1333} {greenBright >} firecow`,
+    ];
+    expect(writeStreams.stdoutLines).toEqual(expect.arrayContaining(expected));
+});