From fbaac6cd5ee8885b6343134e420355c4524f668a Mon Sep 17 00:00:00 2001
From: Omar Ajoue <krynble@gmail.com>
Date: Sat, 27 Nov 2021 10:54:18 +0100
Subject: [PATCH] :rotating_light: Stabilize test workflows (#2480)

* Attempt to fix test workflows execution

* Remove apt update

* trying to fix timezone

* Trying to fix build issues

* Reduced concurrency level

* Improve error message and further decrease concurrency level

* Further reduce concurrency level

* Removed concurrency

* Removing update credentials as it's not working currently

* Also removing export

* Fixed versions for typeorm and sqlite

* Re add concurrency

* Adjustig sqlite3 and typeorm versions

* Fixing only sqlite version

* Fixing only typeorm version

* Reverting unnecessary changes
---
 .github/workflows/test-workflows.yml  | 40 +++++++++++++--------------
 packages/cli/commands/executeBatch.ts |  3 +-
 packages/cli/package.json             |  2 +-
 3 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/test-workflows.yml b/.github/workflows/test-workflows.yml
index 8eee038b15..7cec395af2 100644
--- a/.github/workflows/test-workflows.yml
+++ b/.github/workflows/test-workflows.yml
@@ -34,10 +34,10 @@ jobs:
       -
         name: Install dependencies
         run: |
-          apt update -y
-          echo 'tzdata tzdata/Areas select Europe' | debconf-set-selections
-          echo 'tzdata tzdata/Zones/Europe select Paris' | debconf-set-selections
-          DEBIAN_FRONTEND="noninteractive" apt-get install -y graphicsmagick
+          sudo apt update -y
+          echo 'tzdata tzdata/Areas select Europe' | sudo debconf-set-selections
+          echo 'tzdata tzdata/Zones/Europe select Paris' | sudo debconf-set-selections
+          DEBIAN_FRONTEND="noninteractive" sudo apt-get install -y graphicsmagick
         shell: bash
       -
         name: npm install and build
@@ -75,19 +75,19 @@ jobs:
         shell: bash
         env:
           N8N_ENCRYPTION_KEY: ${{secrets.ENCRYPTION_KEY}}
-      -
-        name: Export credentials
-        if: always()
-        run: n8n/packages/cli/bin/n8n export:credentials --output=test-workflows/credentials.json --all --pretty
-        shell: bash
-        env:
-          N8N_ENCRYPTION_KEY: ${{secrets.ENCRYPTION_KEY}}
-      -
-        name: Commit and push credential changes
-        if: always()
-        run: |
-          cd test-workflows
-          git config --global user.name 'n8n test bot'
-          git config --global user.email 'n8n-test-bot@users.noreply.github.com'
-          git commit -am "Automated credential update"
-          git push --force --quiet "https://janober:${{ secrets.TOKEN }}@github.com/n8n-io/test-workflows.git" main:main
+      # -
+      #   name: Export credentials
+      #   if: always()
+      #   run: n8n/packages/cli/bin/n8n export:credentials --output=test-workflows/credentials.json --all --pretty
+      #   shell: bash
+      #   env:
+      #     N8N_ENCRYPTION_KEY: ${{secrets.ENCRYPTION_KEY}}
+      # -
+      #   name: Commit and push credential changes
+      #   if: always()
+      #   run: |
+      #     cd test-workflows
+      #     git config --global user.name 'n8n test bot'
+      #     git config --global user.email 'n8n-test-bot@users.noreply.github.com'
+      #     git commit -am "Automated credential update"
+      #     git push --force --quiet "https://janober:${{ secrets.TOKEN }}@github.com/n8n-io/test-workflows.git" main:main
diff --git a/packages/cli/commands/executeBatch.ts b/packages/cli/commands/executeBatch.ts
index 587f91c2a9..f415e3c5c2 100644
--- a/packages/cli/commands/executeBatch.ts
+++ b/packages/cli/commands/executeBatch.ts
@@ -854,7 +854,8 @@ export class ExecuteBatch extends Command {
 					}
 				}
 			} catch (e) {
-				executionResult.error = 'Workflow failed to execute.';
+				// eslint-disable-next-line @typescript-eslint/restrict-template-expressions, @typescript-eslint/no-unsafe-member-access
+				executionResult.error = `Workflow failed to execute: ${e.message}`;
 				executionResult.executionStatus = 'error';
 			}
 			clearTimeout(timeoutTimer);
diff --git a/packages/cli/package.json b/packages/cli/package.json
index e8c306ef9e..f759b8d540 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -123,7 +123,7 @@
     "sqlite3": "^5.0.1",
     "sse-channel": "^3.1.1",
     "tslib": "1.14.1",
-    "typeorm": "^0.2.30",
+    "typeorm": "0.2.30",
     "winston": "^3.3.3"
   },
   "jest": {