Merge branch 'main' into remove-uploadFromActions-params

lib/actions-util.js

@@ -141,12 +141,6 @@ function branchesToArray(branches) {
     }
     return "**";
 }
-var MissingTriggers;
-(function (MissingTriggers) {
-    MissingTriggers[MissingTriggers["None"] = 0] = "None";
-    MissingTriggers[MissingTriggers["Push"] = 1] = "Push";
-    MissingTriggers[MissingTriggers["PullRequest"] = 2] = "PullRequest";
-})(MissingTriggers || (MissingTriggers = {}));
 function toCodedErrors(errors) {
     return Object.entries(errors).reduce((acc, [key, value]) => {
         acc[key] = { message: value, code: key };
@@ -157,8 +151,6 @@ function toCodedErrors(errors) {
 // message to add as a warning annotation to the run
 exports.WorkflowErrors = toCodedErrors({
     MismatchedBranches: `Please make sure that every branch in on.pull_request is also in on.push so that Code Scanning can compare pull requests against the state of the base branch.`,
-    MissingHooks: `Please specify on.push and on.pull_request hooks so that Code Scanning can compare pull requests against the state of the base branch.`,
-    MissingPullRequestHook: `Please specify an on.pull_request hook so that Code Scanning is explicitly run against pull requests. This will be required to see results on pull requests from January 31 2021.`,
     MissingPushHook: `Please specify an on.push hook so that Code Scanning can compare pull requests against the state of the base branch.`,
     PathsSpecified: `Using on.push.paths can prevent Code Scanning annotating new alerts in your pull requests.`,
     PathsIgnoreSpecified: `Using on.push.paths-ignore can prevent Code Scanning annotating new alerts in your pull requests.`,
@@ -185,27 +177,27 @@ function getWorkflowErrors(doc) {
             }
         }
     }
-    let missing = MissingTriggers.None;
+    let missingPush = false;
     if (doc.on === undefined) {
         // this is not a valid config
     }
     else if (typeof doc.on === "string") {
         if (doc.on === "pull_request") {
-            missing = MissingTriggers.Push;
+            missingPush = true;
         }
     }
     else if (Array.isArray(doc.on)) {
         const hasPush = doc.on.includes("push");
         const hasPullRequest = doc.on.includes("pull_request");
         if (hasPullRequest && !hasPush) {
-            missing = missing | MissingTriggers.Push;
+            missingPush = true;
         }
     }
     else if (isObject(doc.on)) {
         const hasPush = Object.prototype.hasOwnProperty.call(doc.on, "push");
         const hasPullRequest = Object.prototype.hasOwnProperty.call(doc.on, "pull_request");
         if (!hasPush && hasPullRequest) {
-            missing = missing | MissingTriggers.Push;
+            missingPush = true;
         }
         if (hasPush && hasPullRequest) {
             const paths = (_e = doc.on.push) === null || _e === void 0 ? void 0 : _e.paths;
@@ -243,21 +235,8 @@ function getWorkflowErrors(doc) {
             }
         }
     }
-    else {
-        // on is not a known type
-        // this workflow is likely malformed
-        missing = MissingTriggers.Push | MissingTriggers.PullRequest;
-    }
-    switch (missing) {
-        case MissingTriggers.PullRequest | MissingTriggers.Push:
-            errors.push(exports.WorkflowErrors.MissingHooks);
-            break;
-        case MissingTriggers.PullRequest:
-            errors.push(exports.WorkflowErrors.MissingPullRequestHook);
-            break;
-        case MissingTriggers.Push:
-            errors.push(exports.WorkflowErrors.MissingPushHook);
-            break;
+    if (missingPush) {
+        errors.push(exports.WorkflowErrors.MissingPushHook);
     }
     return errors;
 }
@@ -287,7 +266,7 @@ async function validateWorkflow() {
         }
         core.warning(message);
     }
-    return `warning: ${formatWorkflowCause(workflowErrors)}`;
+    return formatWorkflowCause(workflowErrors);
 }
 exports.validateWorkflow = validateWorkflow;
 function formatWorkflowErrors(errors) {

lib/actions-util.test.js

@@ -167,39 +167,39 @@ ava_1.default("getWorkflowErrors() for a range of malformed workflows", (t) => {
     }), []));
     t.deepEqual(...errorCodes(actionsutil.getWorkflowErrors({
         on: 1,
-    }), [actionsutil.WorkflowErrors.MissingHooks]));
+    }), []));
     t.deepEqual(...errorCodes(actionsutil.getWorkflowErrors({
         on: 1,
         jobs: 1,
-    }), [actionsutil.WorkflowErrors.MissingHooks]));
+    }), []));
     t.deepEqual(...errorCodes(actionsutil.getWorkflowErrors({
         on: 1,
         jobs: [1],
-    }), [actionsutil.WorkflowErrors.MissingHooks]));
+    }), []));
     t.deepEqual(...errorCodes(actionsutil.getWorkflowErrors({
         on: 1,
         jobs: { 1: 1 },
-    }), [actionsutil.WorkflowErrors.MissingHooks]));
+    }), []));
     t.deepEqual(...errorCodes(actionsutil.getWorkflowErrors({
         on: 1,
         jobs: { test: 1 },
-    }), [actionsutil.WorkflowErrors.MissingHooks]));
+    }), []));
     t.deepEqual(...errorCodes(actionsutil.getWorkflowErrors({
         on: 1,
         jobs: { test: [1] },
-    }), [actionsutil.WorkflowErrors.MissingHooks]));
+    }), []));
     t.deepEqual(...errorCodes(actionsutil.getWorkflowErrors({
         on: 1,
         jobs: { test: { steps: 1 } },
-    }), [actionsutil.WorkflowErrors.MissingHooks]));
+    }), []));
     t.deepEqual(...errorCodes(actionsutil.getWorkflowErrors({
         on: 1,
         jobs: { test: { steps: [{ notrun: "git checkout HEAD^2" }] } },
-    }), [actionsutil.WorkflowErrors.MissingHooks]));
+    }), []));
     t.deepEqual(...errorCodes(actionsutil.getWorkflowErrors({
         on: 1,
         jobs: { test: [undefined] },
-    }), [actionsutil.WorkflowErrors.MissingHooks]));
+    }), []));
     t.deepEqual(...errorCodes(actionsutil.getWorkflowErrors(1), []));
     t.deepEqual(...errorCodes(actionsutil.getWorkflowErrors({
         on: {
@@ -261,6 +261,10 @@ ava_1.default("formatWorkflowErrors() when there are multiple errors", (t) => {
     ]);
     t.true(message.startsWith("2 issues were detected with this workflow:"));
 });
+ava_1.default("formatWorkflowCause() with no errors", (t) => {
+    const message = actionsutil.formatWorkflowCause([]);
+    t.deepEqual(message, undefined);
+});
 ava_1.default("formatWorkflowCause()", (t) => {
     const message = actionsutil.formatWorkflowCause([
         actionsutil.WorkflowErrors.CheckoutWrongHead,