From 49e0ba23fb8f6fa93c7016b5ac72abc0d4e37014 Mon Sep 17 00:00:00 2001 From: "Rodrigo Rodriguez (Pragmatismo)" Date: Fri, 28 Mar 2025 07:14:35 -0300 Subject: [PATCH] fix(workflows): clean up node.yaml by removing unnecessary whitespace --- .forgejo/workflows/node.yaml | 6 ++++-- packages/core.gbapp/services/GBMinService.ts | 7 ++++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.forgejo/workflows/node.yaml b/.forgejo/workflows/node.yaml index 9f2891c7c..c7d6ef6ad 100644 --- a/.forgejo/workflows/node.yaml +++ b/.forgejo/workflows/node.yaml @@ -43,7 +43,9 @@ jobs: rm -rf packages/default.gbui/node_modules - name: Kill previous Node.js process (if running) - run: pkill -f "node dist/src/app.js" || true # Ignore if process doesn't exist + run: | + pkill -f "node dist/src/app.js" || true # Ignore if process doesn't exist - name: Start Node.js in background (and persist after workflow) - run: nohup node dist/src/app.js > /dev/null 2>&1 & \ No newline at end of file + run: | + nohup npm run start > /dev/null 2>&1 & \ No newline at end of file diff --git a/packages/core.gbapp/services/GBMinService.ts b/packages/core.gbapp/services/GBMinService.ts index 7d334c8da..81084bf6e 100644 --- a/packages/core.gbapp/services/GBMinService.ts +++ b/packages/core.gbapp/services/GBMinService.ts @@ -803,8 +803,13 @@ export class GBMinService { : GBConfigService.get('MARKETPLACE_SECRET') }; if (GBConfigService.get('GB_MODE') !== 'legacy') { + + const url = + process.env.BOT_URL || + `http://localhost:${GBConfigService.get('PORT')}`; + startRouter(GBServer.globals.server, instance.botId); - config['clientOptions'] = { baseUri: `http://localhost:${GBConfigService.get('PORT')}` }; + config['clientOptions'] = { baseUri: url }; } const adapter = new BotFrameworkAdapter(config);