Fix incorrect building commands for devserver

Author: leeyi45

.github/actions/src/load-artifacts/__tests__/artifact.test.ts

@@ -1,3 +1,4 @@
+import { ArtifactNotFoundError } from '@actions/artifact';
 import * as core from '@actions/core';
 import * as exec from '@actions/exec';
 import * as manifest from '@sourceacademy/modules-repotools/manifest';
@@ -10,10 +11,10 @@ vi.mock(import('@actions/core'), async importOriginal => {
     ...original,
     // Mock these functions to remove stdout output
     error: vi.fn(),
-    info: () => {},
-    startGroup: () => {},
+    info: () => { },
+    startGroup: () => { },
     setFailed: vi.fn(),
-    endGroup: () => {}
+    endGroup: () => { }
   };
 });
 const mockedResolveAllTabs = vi.spyOn(manifest, 'resolveAllTabs');
@@ -41,6 +42,7 @@ test('tab resolution errors cause setFailed to be called', async () => {
 
   await main();
 
+  expect(mockedResolveAllTabs).toHaveBeenCalledOnce();
   expect(core.error).toHaveBeenCalledExactlyOnceWith('error1');
   expect(core.setFailed).toHaveBeenCalledExactlyOnceWith('Tab resolution failed with errors');
 });
@@ -68,24 +70,28 @@ test('tabs that can\'t be found are built', async () => {
     if (name === 'Tab0-tab') {
       return { artifact: { id: 0 } };
     }
-    throw new Error();
+    throw new ArtifactNotFoundError();
   });
 
   await main();
 
   expect(mockedGetArtifact).toHaveBeenCalledTimes(2);
+  expect(mockedResolveAllTabs).toHaveBeenCalledOnce();
+
   const [[artifactCall0], [artifactCall1]] = mockedGetArtifact.mock.calls;
   expect(artifactCall0).toEqual('Tab0-tab');
   expect(artifactCall1).toEqual('Tab1-tab');
 
   expect(exec.exec).toHaveBeenCalledTimes(2);
-  const [[,execCall0], [,execCall1]] = vi.mocked(exec.exec).mock.calls;
-  console.log('args are', execCall0);
+  const [[execCmd0, execCall0], [execCmd1, execCall1]] = vi.mocked(exec.exec).mock.calls;
+
+  expect(execCmd0).toEqual('yarn workspaces focus');
   expect(execCall0).toContain('@sourceacademy/tab-Tab1');
   expect(execCall0).not.toContain('@sourceacademy/tab-Tab0');
 
-  expect(execCall1).toContain('@sourceacademy/tab-Tab1');
-  expect(execCall1).not.toContain('@sourceacademy/tab-Tab0');
+  expect(execCmd1).toEqual('yarn workspaces foreach -pA');
+  expect(execCall1).toContain('--include @sourceacademy/tab-Tab1');
+  expect(execCall1).not.toContain('--include @sourceacademy/tab-Tab0');
 });
 
 test('install failure means build doesn\'t happen', async () => {
@@ -101,11 +107,12 @@ test('install failure means build doesn\'t happen', async () => {
     }
   });
 
-  mockedGetArtifact.mockRejectedValueOnce(new Error());
-
+  mockedGetArtifact.mockRejectedValueOnce(new ArtifactNotFoundError());
   mockedExec.mockResolvedValueOnce(1);
+
   await main();
 
+  expect(mockedGetArtifact).toHaveBeenCalledOnce();
   expect(exec.exec).toHaveBeenCalledOnce();
-  expect(core.setFailed).toHaveBeenCalledExactlyOnceWith('yarn workspace focus failed for Tab0');
+  expect(core.setFailed).toHaveBeenCalledExactlyOnceWith('yarn workspace focus failed');
 });

.github/actions/src/load-artifacts/index.ts

@@ -1,5 +1,5 @@
 import pathlib from 'path';
-import { DefaultArtifactClient } from '@actions/artifact';
+import { ArtifactNotFoundError, DefaultArtifactClient } from '@actions/artifact';
 import * as core from '@actions/core';
 import { exec } from '@actions/exec';
 import { bundlesDir, outDir, tabsDir } from '@sourceacademy/modules-repotools/getGitRoot';
@@ -19,40 +19,49 @@ export async function main() {
     return;
   }
 
-  const tabPromises = Object.keys(tabsResult.tabs).map(async tabName => {
+  const tabPromises = Object.keys(tabsResult.tabs).map(async (tabName): Promise<string | null> => {
     try {
       const { artifact: { id } } = await artifact.getArtifact(`${tabName}-tab`);
       await artifact.downloadArtifact(id, { path: pathlib.join(outDir, 'tabs') });
       core.info(`Downloaded artifact for ${tabName}`);
-      return;
+      return null;
     } catch (error) {
-      core.error(`Error retrieving artifact for ${tabName}, will try building`);
-      core.error(error as Error);
+      if (!(error instanceof ArtifactNotFoundError)) {
+        throw error;
+      }
+      core.error(`Error retrieving artifact for ${tabName}, need to try building`);
+      return tabName;
     }
+  });
 
-    // Artifact could not be found, we probably need to build it
-    const focusExitCode = await exec('yarn', ['workspaces', 'focus', `@sourceacademy/tab-${tabName}`]);
-    if (focusExitCode !== 0) {
-      core.setFailed(`yarn workspace focus failed for ${tabName}`);
-      return;
-    }
+  // Artifacts could not be found, we probably need to build it
+  const tabsToBuild = (await Promise.all(tabPromises)).filter(x => x !== null);
+  if (tabsToBuild.length === 0) return;
 
-    const buildExitCode = await exec('yarn', ['workspaces', 'foreach', '-A', '--include', `@sourceacademy/tab-${tabName}`, 'run', 'build']);
-    if (buildExitCode !== 0) {
-      core.setFailed(`Building ${tabName} failed`);
-      return;
-    }
-    core.info(`Built ${tabName}`);
-  });
+  // focus all at once
+  const workspaces = tabsToBuild.map(each => `@sourceacademy/tab-${each}`);
+  const focusExitCode = await exec('yarn workspaces focus', workspaces, { silent: false });
+  if (focusExitCode !== 0) {
+    core.setFailed('yarn workspace focus failed');
+    return;
+  }
 
-  await Promise.all(tabPromises);
+  const workspaceBuildArgs = workspaces.map(each => `--include ${each}`);
+  const buildExitCode = await exec(
+    'yarn workspaces foreach -pA',
+    [...workspaceBuildArgs, 'run', 'build'],
+    { silent: false }
+  );
+  if (buildExitCode !== 0) {
+    core.setFailed('Building tabs failed');
+  }
 }
 
 if (process.env.GITHUB_ACTIONS) {
   // Only automatically execute when running in github actions
   try {
     await main();
   } catch (error: any) {
-    core.setFailed(error.message);
+    core.setFailed(error);
   }
 }