[server] In the GitHub App, also skip prebuilds if the repository has no prebuild tasks configured

Author: jankeromnes

components/server/ee/src/prebuilds/github-app-rules.ts

@@ -44,11 +44,6 @@ export class GithubAppRules {
             return false;
         }
 
-        const hasPrebuildTask = !!config.tasks && config.tasks.find((t) => !!t.before || !!t.init || !!t.prebuild);
-        if (!hasPrebuildTask) {
-            return false;
-        }
-
         const prebuildCfg = this.mergeWithDefaultConfig(config).prebuilds!;
         if (isPR) {
             if (isFork) {

components/server/ee/src/prebuilds/github-app.spec.ts

@@ -26,17 +26,6 @@ describe("GitHub app", () => {
         chai.assert.isFalse(rules.shouldRunPrebuild(undefined, false, true, true));
     });
 
-    it("should not run prebuilds without tasks to execute", async () => {
-        const noTaskConfig: WorkspaceConfig = {
-            tasks: [],
-        };
-        const rules = container.get(GithubAppRules) as GithubAppRules;
-        chai.assert.isFalse(rules.shouldRunPrebuild(noTaskConfig, true, false, false));
-        chai.assert.isFalse(rules.shouldRunPrebuild(noTaskConfig, false, true, false));
-        chai.assert.isFalse(rules.shouldRunPrebuild(noTaskConfig, false, false, false));
-        chai.assert.isFalse(rules.shouldRunPrebuild(noTaskConfig, false, true, true));
-    });
-
     it("should behave well with individual configuration", async () => {
         const rules = container.get(GithubAppRules) as GithubAppRules;
 

components/server/ee/src/prebuilds/github-app.ts

@@ -274,9 +274,11 @@ export class GithubApp {
             user = r.user;
             project = r.project;
 
-            const runPrebuild = this.appRules.shouldRunPrebuild(config, branch == repo.default_branch, false, false);
+            const runPrebuild =
+                this.prebuildManager.shouldPrebuild(config) &&
+                this.appRules.shouldRunPrebuild(config, branch == repo.default_branch, false, false);
             if (!runPrebuild) {
-                const reason = `Not running prebuild, the user did not enable it for this context`;
+                const reason = `Not running prebuild, the user did not enable it for this context or did not configure prebuild task(s)`;
                 log.debug(logCtx, reason, { contextURL });
                 span.log({ "not-running": reason, config: config });
                 return;
@@ -448,7 +450,8 @@ export class GithubApp {
         const contextURL = pr.html_url;
 
         const isFork = pr.head.repo.id !== pr.base.repo.id;
-        const runPrebuild = this.appRules.shouldRunPrebuild(config, false, true, isFork);
+        const runPrebuild =
+            this.prebuildManager.shouldPrebuild(config) && this.appRules.shouldRunPrebuild(config, false, true, isFork);
         let prebuildStartPromise: Promise<StartPrebuildResult> | undefined;
         if (runPrebuild) {
             const commitInfo = await this.getCommitInfo(user, ctx.payload.repository.html_url, pr.head.sha);
@@ -461,11 +464,16 @@ export class GithubApp {
             prebuildStartPromise.catch((err) => log.error(err, "Error while starting prebuild", { contextURL }));
             return prebuildStartPromise;
         } else {
-            log.debug({ userId: user.id }, `Not running prebuild, the user did not enable it for this context`, null, {
-                contextURL,
-                userId: user.id,
-                project,
-            });
+            log.debug(
+                { userId: user.id },
+                `Not running prebuild, the user did not enable it for this context or did not configure prebuild task(s)`,
+                null,
+                {
+                    contextURL,
+                    userId: user.id,
+                    project,
+                },
+            );
             return;
         }
     }