cleanup

Author: camillobruni

tests/build.mjs

@@ -3,7 +3,7 @@ import fs from "fs";
 import path from "path";
 import { DefaultSuites } from "../suites/default-suites.mjs";
 import { ExperimentalSuites } from "../suites-experimental/suites.mjs";
-import { getChangedFiles, logError, logWarn, runActionGroup, sh } from "./helper.mjs";
+import { getChangedFiles, parseGitFiles, logError, logWarn, runActionGroup, sh } from "./helper.mjs";
 import { EXCLUDES } from "./excludes.mjs";
 
 function findWorkloadForUrl(suiteUrl) {
@@ -110,8 +110,8 @@ async function checkGitStatus() {
     try {
         await runActionGroup("Checking for uncommitted build changes...", async () => {
             const status = await sh("git", "status", "--porcelain", "suites", "suites-experimental");
-            const allDirtyFiles = status.stdoutString.split("\n").map(line => line.trim()).filter(line => line.length > 0);
-            const dirtyFiles = allDirtyFiles.filter(line => !line.includes("package-lock.json"));
+            const allDirtyFiles = parseGitFiles(status.stdoutString, { isPorcelain: true });
+            const dirtyFiles = allDirtyFiles.filter((path) => !path.includes("package-lock.json"));
             if (dirtyFiles.length > 0) {
                 logError(dirtyFiles.join("\n"));
                 throw new Error("Git tree is dirty");

tests/helper.mjs

@@ -4,16 +4,6 @@ import fs from "fs";
 
 export const GITHUB_ACTIONS_OUTPUT = "GITHUB_ACTIONS_OUTPUT" in process.env || "GITHUB_EVENT_PATH" in process.env;
 
-export function getChangedFiles() {
-    // "--diff-filter=ACMR" => ignore deleted files.
-    const diffOut = execFileSync("git", ["diff", "--name-only", "--diff-filter=ACMR", "@{upstream}"], { encoding: "utf8" });
-    const files = diffOut
-        .split("\n")
-        .map((f) => f.trim())
-        .filter((f) => f.length > 0 && fs.existsSync(f));
-    return [...new Set(files)];
-}
-
 export function logInfo(...args) {
     const text = args.join(" ");
     console.log(styleText("yellow", text));
@@ -119,3 +109,28 @@ export async function sh(binary, ...args) {
             console.log("::endgroup::");
     }
 }
+
+export function getChangedFiles() {
+    // "--diff-filter=ACMR" => ignore deleted files.
+    const diffOut = execFileSync("git", ["diff", "--name-only", "--diff-filter=ACMR", "@{upstream}"], { encoding: "utf8" });
+    return parseGitFiles(diffOut, { isPorcelain: false });
+}
+
+export function parseGitFiles(output, { isPorcelain = false } = {}) {
+    const files = new Set();
+    for (let line of output.split("\n")) {
+        line = line.trimEnd();
+        if (isPorcelain) {
+            if (line.length <= 3)
+                continue;
+            line = line.substring(3);
+        } else {
+            if (line.length === 0)
+                continue;
+        }
+        if (fs.existsSync(line))
+            files.add(line);
+
+    }
+    return [...files];
+}