Add defaultIfInvalid argument to satisfiesGHESVersion

Author: koesie10

lib/upload-lib.js

@@ -575,6 +575,19 @@ test("throwIfCombineSarifFilesDisabled when on GHES 3.18", async (t) => {
   );
 });
 
+test("throwIfCombineSarifFilesDisabled with an invalid GHES version", async (t) => {
+  await t.notThrowsAsync(
+    uploadLib.throwIfCombineSarifFilesDisabled(
+      [createMockSarif("abc", "def"), createMockSarif("abc", "def")],
+      createFeatures([]),
+      {
+        type: GitHubVariant.GHES,
+        version: "foobar",
+      },
+    ),
+  );
+});
+
 test("throwIfCombineSarifFilesDisabled with only 1 run", async (t) => {
   await t.notThrowsAsync(
     uploadLib.throwIfCombineSarifFilesDisabled(

lib/upload-lib.js.map

@@ -132,7 +132,7 @@ export async function shouldShowCombineSarifFilesDeprecationWarning(
   // Do not show this warning on GHES versions before 3.14.0
   if (
     githubVersion.type === GitHubVariant.GHES &&
-    satisfiesGHESVersion(githubVersion, "<3.14")
+    satisfiesGHESVersion(githubVersion, "<3.14", true)
   ) {
     return false;
   }
@@ -177,7 +177,7 @@ async function shouldDisableCombineSarifFiles(
 ) {
   if (githubVersion.type === GitHubVariant.GHES) {
     // Never block on GHES versions before 3.18.
-    if (satisfiesGHESVersion(githubVersion, "<3.18")) {
+    if (satisfiesGHESVersion(githubVersion, "<3.18", true)) {
       return false;
     }
   } else {

lib/upload-lib.test.js

@@ -1136,17 +1136,23 @@ export function checkActionVersion(
  * This will check whether the given GitHub version satisfies the given range,
  * taking into account that a range like >=3.18 will also match the GHES 3.18
  * pre-release/RC versions.
+ *
+ * When the given `githubVersion` is not a GHES version, or if the version
+ * is invalid, this will return `defaultIfInvalid`.
  */
 export function satisfiesGHESVersion(
   githubVersion: GitHubVersion,
   range: string,
+  defaultIfInvalid = false,
 ): boolean {
   if (githubVersion.type !== GitHubVariant.GHES) {
-    return false;
+    return defaultIfInvalid;
   }
 
-  const semverVersion =
-    semver.coerce(githubVersion.version) ?? new semver.SemVer("0.0.0");
+  const semverVersion = semver.coerce(githubVersion.version);
+  if (semverVersion === null) {
+    return defaultIfInvalid;
+  }
 
   // We always drop the pre-release part of the version, since anything that
   // applies to GHES 3.18.0 should also apply to GHES 3.18.0.pre1.