Skip to content

Commit

Permalink
fix(cli): properly resolve merge config on mobile build closes #9970 (#…
Browse files Browse the repository at this point in the history
…10605)

just applying the change from #10600 to xcode to fix the linked issue :)
  • Loading branch information
lucasfernog authored Aug 15, 2024
1 parent b6dca99 commit 9089d97
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 0 deletions.
6 changes: 6 additions & 0 deletions .changes/fix-config-override.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"tauri-cli": patch:bug
"@tauri-apps/cli": patch:bug
---

Fixes `[android|ios] build --config <config>` failing to resolve.
4 changes: 4 additions & 0 deletions tooling/cli/src/mobile/ios/xcode_script.rs
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,10 @@ pub fn command(options: Options) -> Result<()> {
MobileTarget::Ios,
)?;

if let Some(config) = &cli_options.config {
crate::helpers::config::merge_with(&config.0)?;
}

let env = env()?.explicit_env_vars(cli_options.vars);

if !options.sdk_root.is_dir() {
Expand Down

0 comments on commit 9089d97

Please sign in to comment.