Merge branch 'master-test' into docker-registry

Author: superewald

src/git-data.ts

@@ -80,8 +80,8 @@ export class GitData {
         }
     }
 
-    static changedFiles (defaultBranch: string) {
-        return Utils.syncSpawn(["git", "diff", "--name-only", defaultBranch]).stdout.split("\n");
+    static changedFiles (defaultBranch: string, cwd: string) {
+        return Utils.syncSpawn(["git", "diff", "--name-only", defaultBranch], cwd).stdout.split("\n");
     }
 
     private async initRemoteData (cwd: string, writeStreams: WriteStreams): Promise<void> {

src/job.ts

@@ -1555,7 +1555,7 @@ export class Job {
             if (include["local"]) {
                 const expandedInclude = Utils.expandText(include["local"], this._variables);
                 validateIncludeLocal(expandedInclude);
-                const files = resolveIncludeLocal(expandedInclude, cwd);
+                const files = await resolveIncludeLocal(expandedInclude, cwd);
                 if (files.length == 0) {
                     throw new AssertionError({message: `Local include file \`${include["local"]}\` specified in \`.${this.name}\` cannot be found!`});
                 }

src/parser-includes.ts

@@ -7,7 +7,6 @@ import assert, {AssertionError} from "assert";
 import chalk from "chalk";
 import {Parser} from "./parser.js";
 import axios from "axios";
-import globby from "globby";
 import path from "path";
 import semver from "semver";
 import {RE2JS} from "re2js";
@@ -93,7 +92,7 @@ export class ParserIncludes {
             }
             if (value["local"]) {
                 validateIncludeLocal(value["local"]);
-                const files = resolveIncludeLocal(value["local"], cwd);
+                const files = await resolveIncludeLocal(value["local"], cwd);
                 if (files.length == 0) {
                     throw new AssertionError({message: `Local include file cannot be found ${value["local"]}`});
                 }
@@ -327,11 +326,11 @@ export class ParserIncludes {
 
     static readonly memoLocalRepoFiles = (() => {
         const cache = new Map<string, string[]>();
-        return (path: string) => {
+        return async (path: string) => {
             let result = cache.get(path);
             if (typeof result !== "undefined") return result;
 
-            result = globby.sync(path, {dot: true, gitignore: true});
+            result = (await Utils.getTrackedFiles(path)).map(p => `${path}/${p}`);
             cache.set(path, result);
             return result;
         };
@@ -361,8 +360,8 @@ export function resolveSemanticVersionRange (range: string, gitTags: string[]) {
     return found;
 }
 
-export function resolveIncludeLocal (pattern: string, cwd: string) {
-    const repoFiles = ParserIncludes.memoLocalRepoFiles(cwd);
+export async function resolveIncludeLocal (pattern: string, cwd: string) {
+    const repoFiles = await ParserIncludes.memoLocalRepoFiles(cwd);
 
     if (!pattern.startsWith("/")) pattern = `/${pattern}`; // Ensure pattern starts with `/`
     pattern = `${cwd}${pattern}`;

src/utils.ts

@@ -199,7 +199,7 @@ export class Utils {
         for (const rule of opt.rules) {
             if (!Utils.evaluateRuleIf(rule.if, opt.variables)) continue;
             if (!Utils.evaluateRuleExist(opt.cwd, rule.exists)) continue;
-            if (evaluateRuleChanges && !Utils.evaluateRuleChanges(gitData.branches.default, rule.changes)) continue;
+            if (evaluateRuleChanges && !Utils.evaluateRuleChanges(gitData.branches.default, rule.changes, opt.cwd)) continue;
 
             when = rule.when ? rule.when : jobWhen;
             allowFailure = rule.allow_failure ?? allowFailure;
@@ -337,7 +337,7 @@ export class Utils {
         return false;
     }
 
-    static evaluateRuleChanges (defaultBranch: string, ruleChanges: string[] | {paths: string[]} | undefined): boolean {
+    static evaluateRuleChanges (defaultBranch: string, ruleChanges: string[] | {paths: string[]} | undefined, cwd: string): boolean {
         if (ruleChanges === undefined) return true;
 
         // Normalize rules:changes:paths to rules:changes
@@ -346,7 +346,7 @@ export class Utils {
         // NOTE: https://docs.gitlab.com/ee/ci/yaml/#ruleschanges
         //   Glob patterns are interpreted with Ruby's [File.fnmatch](https://docs.ruby-lang.org/en/master/File.html#method-c-fnmatch)
         //   with the flags File::FNM_PATHNAME | File::FNM_DOTMATCH | File::FNM_EXTGLOB.
-        return micromatch.some(GitData.changedFiles(`origin/${defaultBranch}`), ruleChanges, {
+        return micromatch.some(GitData.changedFiles(`origin/${defaultBranch}`, cwd), ruleChanges, {
             nonegate: true,
             noextglob: true,
             posix: false,
@@ -510,5 +510,12 @@ export class Utils {
 
     static async stopDockerRegistry (containerExecutable: string): Promise<void> {
         await Utils.spawn([containerExecutable, "rm", "-f", this.gclRegistryPrefix]);
+
+    static async getTrackedFiles (cwd: string): Promise<string[]> {
+        const lsFilesRes = await Utils.bash("git ls-files --deduplicate", cwd);
+        if (lsFilesRes.exitCode != 0) {
+            throw new Error(`Failed to list tracked files in ${cwd}: ${lsFilesRes.stderr}`);
+        }
+        return lsFilesRes.stdout.split("\n");
     }
 }

tests/utils.test.ts

@@ -178,7 +178,7 @@ describe("evaluateRuleChanges", () => {
         test.concurrent(`${t.description} \t\t [input: ${t.input} pattern: ${t.pattern} hasChanges: ${t.hasChanges}]`, () => {
             const spy = import.meta.jest.spyOn(GitData, "changedFiles");
             spy.mockReturnValue(t.input);
-            expect(Utils.evaluateRuleChanges("origin/master", t.pattern)).toBe(t.hasChanges);
+            expect(Utils.evaluateRuleChanges("origin/master", t.pattern, ".")).toBe(t.hasChanges);
         });
     });
 });