mirror of
https://github.com/tauri-apps/tauri.git
synced 2024-12-25 11:43:06 +03:00
parent
9bb68973dd
commit
8ab8d52942
5
.changes/bundler-add-provider-short-name.md
Normal file
5
.changes/bundler-add-provider-short-name.md
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
---
|
||||||
|
"tauri-bundler": patch
|
||||||
|
---
|
||||||
|
|
||||||
|
Provide a provider short name for macOS app notarization if your Apple developer account is connected to more than one team.
|
@ -76,6 +76,7 @@ These settings are used only when bundling `app` and `dmg` packages.
|
|||||||
* `license`: Path to the license file for the DMG bundle.
|
* `license`: Path to the license file for the DMG bundle.
|
||||||
* `exception_domain`: The exception domain to use on the macOS .app bundle. Allows communication to the outside world e.g. a web server you're shipping.
|
* `exception_domain`: The exception domain to use on the macOS .app bundle. Allows communication to the outside world e.g. a web server you're shipping.
|
||||||
* `use_bootstrapper`: Enables the bootstrapper script, which allows access to the environment variables.
|
* `use_bootstrapper`: Enables the bootstrapper script, which allows access to the environment variables.
|
||||||
|
* `provider_short_name`: If your Apple ID is connected to multiple teams, you have to specify the provider short name of the team you want to use to notarize your app. See [Customizing the notarization workflow](https://developer.apple.com/documentation/security/notarizing_macos_software_before_distribution/customizing_the_notarization_workflow) and search for `--list-providers` for more information how to obtain your provider short name.
|
||||||
|
|
||||||
### Example `tauri.conf.json`:
|
### Example `tauri.conf.json`:
|
||||||
|
|
||||||
|
@ -258,7 +258,7 @@ pub fn notarize(
|
|||||||
sign(zip_path.clone(), identity, &settings, false)?;
|
sign(zip_path.clone(), identity, &settings, false)?;
|
||||||
};
|
};
|
||||||
|
|
||||||
let notarize_args = vec![
|
let mut notarize_args = vec![
|
||||||
"altool",
|
"altool",
|
||||||
"--notarize-app",
|
"--notarize-app",
|
||||||
"-f",
|
"-f",
|
||||||
@ -268,6 +268,12 @@ pub fn notarize(
|
|||||||
"--primary-bundle-id",
|
"--primary-bundle-id",
|
||||||
identifier,
|
identifier,
|
||||||
];
|
];
|
||||||
|
|
||||||
|
if let Some(provider_short_name) = &settings.macos().provider_short_name {
|
||||||
|
notarize_args.push("--asc-provider");
|
||||||
|
notarize_args.push(provider_short_name);
|
||||||
|
}
|
||||||
|
|
||||||
common::print_info("notarizing app")?;
|
common::print_info("notarizing app")?;
|
||||||
let output = Command::new("xcrun")
|
let output = Command::new("xcrun")
|
||||||
.args(notarize_args)
|
.args(notarize_args)
|
||||||
|
@ -168,6 +168,8 @@ pub struct MacOsSettings {
|
|||||||
pub exception_domain: Option<String>,
|
pub exception_domain: Option<String>,
|
||||||
/// Code signing identity.
|
/// Code signing identity.
|
||||||
pub signing_identity: Option<String>,
|
pub signing_identity: Option<String>,
|
||||||
|
/// Provider short name for notarization.
|
||||||
|
pub provider_short_name: Option<String>,
|
||||||
/// Path to the entitlements.plist file.
|
/// Path to the entitlements.plist file.
|
||||||
pub entitlements: Option<String>,
|
pub entitlements: Option<String>,
|
||||||
/// Path to the Info.plist file for the bundle.
|
/// Path to the Info.plist file for the bundle.
|
||||||
|
@ -65,6 +65,8 @@ pub struct MacConfig {
|
|||||||
pub use_bootstrapper: bool,
|
pub use_bootstrapper: bool,
|
||||||
/// Identity to use for code signing.
|
/// Identity to use for code signing.
|
||||||
pub signing_identity: Option<String>,
|
pub signing_identity: Option<String>,
|
||||||
|
/// Provider short name for notarization.
|
||||||
|
pub provider_short_name: Option<String>,
|
||||||
/// Path to the entitlements file.
|
/// Path to the entitlements file.
|
||||||
pub entitlements: Option<String>,
|
pub entitlements: Option<String>,
|
||||||
}
|
}
|
||||||
|
@ -897,6 +897,13 @@
|
|||||||
"null"
|
"null"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
|
"providerShortName": {
|
||||||
|
"description": "Provider short name for notarization.",
|
||||||
|
"type": [
|
||||||
|
"string",
|
||||||
|
"null"
|
||||||
|
]
|
||||||
|
},
|
||||||
"useBootstrapper": {
|
"useBootstrapper": {
|
||||||
"description": "Enable the boostrapper script.",
|
"description": "Enable the boostrapper script.",
|
||||||
"default": false,
|
"default": false,
|
||||||
@ -1501,4 +1508,4 @@
|
|||||||
"additionalProperties": false
|
"additionalProperties": false
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -420,6 +420,16 @@ fn tauri_config_to_bundle_settings(
|
|||||||
None => config.macos.signing_identity,
|
None => config.macos.signing_identity,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
let provider_short_name = match std::env::var_os("APPLE_PROVIDER_SHORT_NAME") {
|
||||||
|
Some(provider_short_name) => Some(
|
||||||
|
provider_short_name
|
||||||
|
.to_str()
|
||||||
|
.expect("failed to convert APPLE_PROVIDER_SHORT_NAME to string")
|
||||||
|
.to_string(),
|
||||||
|
),
|
||||||
|
None => config.macos.provider_short_name,
|
||||||
|
};
|
||||||
|
|
||||||
Ok(BundleSettings {
|
Ok(BundleSettings {
|
||||||
identifier: config.identifier,
|
identifier: config.identifier,
|
||||||
icon: config.icon,
|
icon: config.icon,
|
||||||
@ -455,6 +465,7 @@ fn tauri_config_to_bundle_settings(
|
|||||||
use_bootstrapper: Some(config.macos.use_bootstrapper),
|
use_bootstrapper: Some(config.macos.use_bootstrapper),
|
||||||
exception_domain: config.macos.exception_domain,
|
exception_domain: config.macos.exception_domain,
|
||||||
signing_identity,
|
signing_identity,
|
||||||
|
provider_short_name,
|
||||||
entitlements: config.macos.entitlements,
|
entitlements: config.macos.entitlements,
|
||||||
info_plist_path: {
|
info_plist_path: {
|
||||||
let path = tauri_dir().join("Info.plist");
|
let path = tauri_dir().join("Info.plist");
|
||||||
|
@ -37,6 +37,7 @@
|
|||||||
"useBootstrapper": false,
|
"useBootstrapper": false,
|
||||||
"exceptionDomain": "",
|
"exceptionDomain": "",
|
||||||
"signingIdentity": null,
|
"signingIdentity": null,
|
||||||
|
"providerShortName": null,
|
||||||
"entitlements": null
|
"entitlements": null
|
||||||
},
|
},
|
||||||
"windows": {
|
"windows": {
|
||||||
|
Loading…
Reference in New Issue
Block a user