From 5965a04979b1fc7d67e19513fa7a6ab6daf532d0 Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Tue, 22 Sep 2020 10:12:17 +0100 Subject: [PATCH] Updating GH actions to use Node 12 LTS to be inline with Node version used in Docker. --- .github/workflows/budibase_ci.yml | 2 +- packages/server/src/workflows/index.js | 30 +++++++++++++------------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml index f4c17b64e..e03768a42 100644 --- a/.github/workflows/budibase_ci.yml +++ b/.github/workflows/budibase_ci.yml @@ -16,7 +16,7 @@ jobs: strategy: matrix: - node-version: [10.x] + node-version: [12.x] steps: - uses: actions/checkout@v2 diff --git a/packages/server/src/workflows/index.js b/packages/server/src/workflows/index.js index 596402ef0..c4e2ad5cd 100644 --- a/packages/server/src/workflows/index.js +++ b/packages/server/src/workflows/index.js @@ -1,21 +1,21 @@ const triggers = require("./triggers") const environment = require("../environment") -//const workerFarm = require("worker-farm") +const workerFarm = require("worker-farm") const singleThread = require("./thread") -//let workers = workerFarm(require.resolve("./thread")) +let workers = workerFarm(require.resolve("./thread")) -// function runWorker(job) { -// return new Promise((resolve, reject) => { -// workers(job, err => { -// if (err) { -// reject(err) -// } else { -// resolve() -// } -// }) -// }) -// } +function runWorker(job) { + return new Promise((resolve, reject) => { + workers(job, err => { + if (err) { + reject(err) + } else { + resolve() + } + }) + }) +} /** * This module is built purely to kick off the worker farm and manage the inputs/outputs @@ -23,9 +23,9 @@ const singleThread = require("./thread") module.exports.init = function() { triggers.workflowQueue.process(async job => { if (environment.BUDIBASE_ENVIRONMENT === "PRODUCTION") { - //await runWorker(job) - await singleThread(job) + await runWorker(job) } else { + console.log("Testing standard thread") await singleThread(job) } })