tauri-apps/archived-tauri-action
1
0
Fork 0
mirror of https://github.com/tauri-apps/tauri-action.git synced 2026-01-31 00:35:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Load correct config when a custom config is supplied (#327)

Browse Source 
* Load correct config when a custom config is supplied

* fmt

Co-authored-by: Fabian-Lars <fabianlars@fabianlars.de>
This commit is contained in:
nicolas-stephan
2023-01-05 17:45:43 +01:00
committed by GitHub
parent 6af4366de8
commit 66d49884fa
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/core/index.ts
View File

@@ -193,10 +193,10 @@ function getConfig(path: string): TauriConfig {
}
}
export function getInfo(root: string): Info {
export function getInfo(root: string, inConfigPath: string | null = null): Info {
const tauriDir = getTauriDir(root);
if (tauriDir !== null) {
const configPath = join(tauriDir, 'tauri.conf.json');
const configPath = inConfigPath ?? join(tauriDir, 'tauri.conf.json');
let name;
let version;
let wixLanguage: string | string[] | { [language: string]: unknown } =
@@ -285,7 +285,7 @@ export async function buildProject(
}
})
.then((runner: Runner) => {
const info = getInfo(root);
const info = getInfo(root, configPath);
if (info.tauriPath) {
return {
tauriPath: info.tauriPath,