Merge remote-tracking branch 'origin/dev-fix-gui-tests' into dev-fix-gui-tests

This commit is contained in:
DJ2LS 2024-01-23 19:12:10 +01:00
commit 90b0ff06e1
2 changed files with 6 additions and 6 deletions

View file

@ -106,7 +106,7 @@ export function getAppDataPath() {
let appDataPath; let appDataPath;
// Check if running in GitHub Actions // Check if running in GitHub Actions
const isGitHubActions = process.env.GITHUB_ACTIONS === 'true'; const isGitHubActions = process.env.GITHUB_ACTIONS === "true";
if (isGitHubActions) { if (isGitHubActions) {
return "/home/runner/work/FreeDATA/FreeDATA/gui/config"; return "/home/runner/work/FreeDATA/FreeDATA/gui/config";
} }

View file

@ -7,9 +7,9 @@ const nconf = require("nconf");
var appDataPath = getAppDataPath(); var appDataPath = getAppDataPath();
var configFolder = path.join(appDataPath, "FreeDATA"); var configFolder = path.join(appDataPath, "FreeDATA");
let configFile = "config.json" let configFile = "config.json";
const isGitHubActions = process.env.GITHUB_ACTIONS === 'true'; const isGitHubActions = process.env.GITHUB_ACTIONS === "true";
if (isGitHubActions) { if (isGitHubActions) {
configFile = "example.json"; configFile = "example.json";
configFolder = appDataPath; configFolder = appDataPath;