Merge branch 'releases/v2'

* releases/v2: Check dist on release branches Log multiple errors
gradle · Feb 6, 2024 · 24d65a1 · 24d65a1
2 parents 83cf5fd + a494d93
commit 24d65a1
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/.github/workflows/check-dist.yml b/.github/workflows/check-dist.yml
@@ -9,6 +9,7 @@ on:
   push:
     branches:
       - main
+      - releases/**
     paths-ignore:
       - '**.md'
   pull_request:

diff --git a/dist/index.js b/dist/index.js
@@ -28050,7 +28050,13 @@ async function run() {
         }
     }
     catch (error) {
-        if (error instanceof Error) {
+        if (error instanceof AggregateError) {
+            core.setFailed(`Multiple errors returned`);
+            for (const err of error.errors) {
+                core.error(`Error ${error.errors.indexOf(err)}: ${err.message}`);
+            }
+        }
+        else if (error instanceof Error) {
             core.setFailed(error.message);
         }
         else {

diff --git a/src/main.ts b/src/main.ts
@@ -25,7 +25,12 @@ export async function run(): Promise<void> {
       }
     }
   } catch (error) {
-    if (error instanceof Error) {
+    if (error instanceof AggregateError) {
+      core.setFailed(`Multiple errors returned`)
+      for (const err of error.errors) {
+        core.error(`Error ${error.errors.indexOf(err)}: ${err.message}`)
+      }
+    } else if (error instanceof Error) {
       core.setFailed(error.message)
     } else {
       core.setFailed(`Unknown object was thrown: ${error}`)