Merge branch 'main' into action-cleanup

sitespeedio · May 24, 2024 · 24ffbe5 · 24ffbe5
2 parents 16f5d96 + 9472375
commit 24ffbe5
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/server/src/util/text.js b/server/src/util/text.js
@@ -3,7 +3,7 @@ import y18n from 'y18n';
 import { getLocalFilePath } from './fileutil.js';
 const locale = nconf.get('localization:defaultLocale');
 const directory =
-  nconf.get('localization:directory') || getLocalFilePath('./locale');
+  nconf.get('localization:directory') || getLocalFilePath('../../locales');
 
 const myy18n = y18n({ updateFiles: false, locale, directory });
 

diff --git a/testrunner/src/testrunners/docker-testrunner.js b/testrunner/src/testrunners/docker-testrunner.js
@@ -103,6 +103,7 @@ export default async function runJob(job) {
     };
   } catch (error) {
     logger.error('Failed to execute job: %s', error.message, job.data.url);
+    job.log('Job failed:' + error.message);
     await cleanupWorkingDirectory(workingDirectory, logger);
     throw error;
   }

diff --git a/testrunner/src/testrunners/testrunner.js b/testrunner/src/testrunners/testrunner.js
@@ -64,6 +64,7 @@ export default async function runJob(job) {
     }
   } catch (error) {
     logger.error('Job execution failed: %s', error.message);
+    job.log('Job failed:' + error.message);
     throw error;
   } finally {
     if (workingDirectory) {