Restore self-compilation using built compiler in CI tests

jakebailey · Oct 10, 2022 · a1f24e5 · a1f24e5
1 parent 8d7b12f
commit a1f24e5
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 12 deletions.
diff --git a/Gulpfile.mjs b/Gulpfile.mjs
@@ -125,6 +125,9 @@ const buildSrc = () => buildProject("src");
 
 task("build-src", series(preSrc, buildSrc));
 
+const cleanSrc = () => cleanProject("src");
+task("clean-src", series(preSrc, cleanSrc));
+
 /**
  * @param {string} entrypoint
  * @param {string} output

diff --git a/scripts/build/projects.mjs b/scripts/build/projects.mjs
@@ -31,7 +31,7 @@ class ProjectQueue {
 
 const execTsc = (/** @type {string[]} */ ...args) =>
     exec(process.execPath,
-         [resolve(findUpRoot(), cmdLineOptions.lkg ? "./lib/tsc" : "./built/local/tsc"),
+         [resolve(findUpRoot(), cmdLineOptions.lkg ? "./lib/tsc.js" : "./built/local/tsc.js"),
           "-b", ...args],
          { hidePrompt: true });
 

diff --git a/scripts/build/tests.mjs b/scripts/build/tests.mjs
@@ -122,17 +122,17 @@ export async function runConsoleTests(runJs, defaultReporter, runInParallel, _wa
             errorStatus = exitCode;
             error = new Error(`Process exited with status code ${errorStatus}.`);
         }
-        // else if (cmdLineOptions.ci && runJs.startsWith("built")) {
-        //     // finally, do a sanity check and build the compiler with the built version of itself
-        //     log.info("Starting sanity check build...");
-        //     // Cleanup everything except lint rules (we'll need those later and would rather not waste time rebuilding them)
-        //     await exec("gulp", ["clean-tsc", "clean-services", "clean-tsserver", "clean-lssl", "clean-tests"]);
-        //     const { exitCode } = await exec("gulp", ["local", "--lkg=false"]);
-        //     if (exitCode !== 0) {
-        //         errorStatus = exitCode;
-        //         error = new Error(`Sanity check build process exited with status code ${errorStatus}.`);
-        //     }
-        // }
+        else if (cmdLineOptions.ci && runJs.startsWith("built")) {
+            // finally, do a sanity check and build the compiler with the built version of itself
+            log.info("Starting sanity check build...");
+            // Cleanup everything except lint rules (we'll need those later and would rather not waste time rebuilding them)
+            await exec("gulp", ["clean-src"]);
+            const { exitCode } = await exec("gulp", ["build-src", "--built"]);
+            if (exitCode !== 0) {
+                errorStatus = exitCode;
+                error = new Error(`Sanity check build process exited with status code ${errorStatus}.`);
+            }
+        }
     }
     catch (e) {
         errorStatus = undefined;