From 87ac48dae6f9d9e77e639a7ec90fd51f8efb985c Mon Sep 17 00:00:00 2001
From: Henry Mercer <henrymercer@github.com>
Date: Fri, 8 May 2026 18:05:35 +0100
Subject: [PATCH] Improve error message

---
 lib/analyze-action.js      | 2 +-
 lib/init-action-post.js    | 2 +-
 lib/init-action.js         | 2 +-
 lib/setup-codeql-action.js | 2 +-
 lib/upload-lib.js          | 2 +-
 lib/upload-sarif-action.js | 2 +-
 src/setup-codeql.ts        | 3 ++-
 7 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/lib/analyze-action.js b/lib/analyze-action.js
index 3fcae5133..446472b87 100644
--- a/lib/analyze-action.js
+++ b/lib/analyze-action.js
@@ -91666,7 +91666,7 @@ async function getEnabledVersionsWithOverlayBaseDatabases(defaultCliVersion, raw
     );
   } catch (e) {
     logger.warning(
-      `While setting up CodeQL, was unable to list overlay-base databases in the Actions cache. Details: ${e}`
+      `Could not list overlay-base databases in the Actions cache while choosing a default CodeQL CLI version, falling back to the highest enabled version. Details: ${getErrorMessage(e)}`
     );
     return [];
   }
diff --git a/lib/init-action-post.js b/lib/init-action-post.js
index 85e878ac9..8e12e0ec6 100644
--- a/lib/init-action-post.js
+++ b/lib/init-action-post.js
@@ -132637,7 +132637,7 @@ async function getEnabledVersionsWithOverlayBaseDatabases(defaultCliVersion, raw
     );
   } catch (e) {
     logger.warning(
-      `While setting up CodeQL, was unable to list overlay-base databases in the Actions cache. Details: ${e}`
+      `Could not list overlay-base databases in the Actions cache while choosing a default CodeQL CLI version, falling back to the highest enabled version. Details: ${getErrorMessage(e)}`
     );
     return [];
   }
diff --git a/lib/init-action.js b/lib/init-action.js
index 0eaa4ed11..1ed7e5490 100644
--- a/lib/init-action.js
+++ b/lib/init-action.js
@@ -90595,7 +90595,7 @@ async function getEnabledVersionsWithOverlayBaseDatabases(defaultCliVersion, raw
     );
   } catch (e) {
     logger.warning(
-      `While setting up CodeQL, was unable to list overlay-base databases in the Actions cache. Details: ${e}`
+      `Could not list overlay-base databases in the Actions cache while choosing a default CodeQL CLI version, falling back to the highest enabled version. Details: ${getErrorMessage(e)}`
     );
     return [];
   }
diff --git a/lib/setup-codeql-action.js b/lib/setup-codeql-action.js
index bda595c5c..243a749cb 100644
--- a/lib/setup-codeql-action.js
+++ b/lib/setup-codeql-action.js
@@ -88091,7 +88091,7 @@ async function getEnabledVersionsWithOverlayBaseDatabases(defaultCliVersion, raw
     );
   } catch (e) {
     logger.warning(
-      `While setting up CodeQL, was unable to list overlay-base databases in the Actions cache. Details: ${e}`
+      `Could not list overlay-base databases in the Actions cache while choosing a default CodeQL CLI version, falling back to the highest enabled version. Details: ${getErrorMessage(e)}`
     );
     return [];
   }
diff --git a/lib/upload-lib.js b/lib/upload-lib.js
index 83b6166f5..b649b5672 100644
--- a/lib/upload-lib.js
+++ b/lib/upload-lib.js
@@ -90698,7 +90698,7 @@ async function getEnabledVersionsWithOverlayBaseDatabases(defaultCliVersion, raw
     );
   } catch (e) {
     logger.warning(
-      `While setting up CodeQL, was unable to list overlay-base databases in the Actions cache. Details: ${e}`
+      `Could not list overlay-base databases in the Actions cache while choosing a default CodeQL CLI version, falling back to the highest enabled version. Details: ${getErrorMessage(e)}`
     );
     return [];
   }
diff --git a/lib/upload-sarif-action.js b/lib/upload-sarif-action.js
index f644db648..522ab1aba 100644
--- a/lib/upload-sarif-action.js
+++ b/lib/upload-sarif-action.js
@@ -91369,7 +91369,7 @@ async function getEnabledVersionsWithOverlayBaseDatabases(defaultCliVersion, raw
     );
   } catch (e) {
     logger.warning(
-      `While setting up CodeQL, was unable to list overlay-base databases in the Actions cache. Details: ${e}`
+      `Could not list overlay-base databases in the Actions cache while choosing a default CodeQL CLI version, falling back to the highest enabled version. Details: ${getErrorMessage(e)}`
     );
     return [];
   }
diff --git a/src/setup-codeql.ts b/src/setup-codeql.ts
index 53deca53b..3db0b6ca4 100644
--- a/src/setup-codeql.ts
+++ b/src/setup-codeql.ts
@@ -308,7 +308,8 @@ export async function getEnabledVersionsWithOverlayBaseDatabases(
     );
   } catch (e) {
     logger.warning(
-      `While setting up CodeQL, was unable to list overlay-base databases in the Actions cache. Details: ${e}`,
+      "Could not list overlay-base databases in the Actions cache while choosing a default " +
+        `CodeQL CLI version, falling back to the highest enabled version. Details: ${util.getErrorMessage(e)}`,
     );
     return [];
   }