Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[match] Add support for Developer ID certificates from G2 Sub-CA #20145

Merged
merged 2 commits into from
May 18, 2022
Merged

[match] Add support for Developer ID certificates from G2 Sub-CA #20145

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6555c05
[match] Add support for Developer ID certificates from G2 Sub-CA
triplef Apr 4, 2022
84f0182
Return multiple cert types when fetching
joshdholtz May 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion cert/lib/cert/runner.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ def certificate_type
when :mac_installer_distribution
return Spaceship::ConnectAPI::Certificate::CertificateType::MAC_INSTALLER_DISTRIBUTION
when :developer_id_application
return Spaceship::ConnectAPI::Certificate::CertificateType::DEVELOPER_ID_APPLICATION
return Spaceship::ConnectAPI::Certificate::CertificateType::DEVELOPER_ID_APPLICATION_G2
when :developer_id_kext
return Spaceship::ConnectAPI::Certificate::CertificateType::DEVELOPER_ID_KEXT
when :developer_id_installer
Expand Down
3 changes: 2 additions & 1 deletion match/lib/match/importer.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,8 @@ def import_cert(params, cert_path: nil, p12_path: nil, profile_path: nil)
].join(',')
when :developer_id_application
certificate_type = [
Spaceship::ConnectAPI::Certificate::CertificateType::DEVELOPER_ID_APPLICATION
Spaceship::ConnectAPI::Certificate::CertificateType::DEVELOPER_ID_APPLICATION,
Spaceship::ConnectAPI::Certificate::CertificateType::DEVELOPER_ID_APPLICATION_G2
].join(',')
when :mac_installer_distribution
certificate_type = [
Expand Down
3 changes: 2 additions & 1 deletion sigh/lib/sigh/runner.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,8 @@ def certificates_for_profile_and_platform
]
elsif profile_type == Spaceship::ConnectAPI::Profile::ProfileType::MAC_APP_DIRECT || profile_type == Spaceship::ConnectAPI::Profile::ProfileType::MAC_CATALYST_APP_DIRECT
types = [
Spaceship::ConnectAPI::Certificate::CertificateType::DEVELOPER_ID_APPLICATION
Spaceship::ConnectAPI::Certificate::CertificateType::DEVELOPER_ID_APPLICATION,
Spaceship::ConnectAPI::Certificate::CertificateType::DEVELOPER_ID_APPLICATION_G2
]
else
types = [
Expand Down
1 change: 1 addition & 0 deletions spaceship/lib/spaceship/connect_api/models/certificate.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ module CertificateType
MAC_APP_DEVELOPMENT = "MAC_APP_DEVELOPMENT"
DEVELOPER_ID_KEXT = "DEVELOPER_ID_KEXT"
DEVELOPER_ID_APPLICATION = "DEVELOPER_ID_APPLICATION"
DEVELOPER_ID_APPLICATION_G2 = "DEVELOPER_ID_APPLICATION_G2"

# As of 2021-11-09, this is only available with Apple ID auth
DEVELOPER_ID_INSTALLER = "DEVELOPER_ID_INSTALLER"
Expand Down