Add XCode 9.1 Support

Branched from my xcode-20 branch and rebased from master
and added support for xcode 9.1 now that the xcode plugin has been
released

Due to:
https://issues.jenkins-ci.org/browse/JENKINS-45509

Change-Id: Ibd0f4c82b5e8f37a9da335c57786eae5dc91aefb
This commit is contained in:
Will Soula 2017-11-20 09:37:31 -07:00
parent 7696ea37fd
commit afd7cc8475
3 changed files with 37 additions and 0 deletions

View File

@ -3070,6 +3070,10 @@ def xcode(registry, xml_parent, data):
(default '')
:arg str keychain-unlock: Unlocks the keychain during use.
(default false)
:arg str bundle-id: The bundle identifier (App ID) for this provisioning
profile (default '')
:arg str provisioning-profile-uuid: The UUID of the provisioning profile
associated to this bundle identifier. (default '')
Example:
@ -3135,6 +3139,22 @@ def xcode(registry, xml_parent, data):
]
convert_mapping_to_xml(xcode, data, mapping, fail_required=True)
has_provisioning_profiles = bool(data.get('provisioning-profiles'))
XML.SubElement(xcode, 'manualSigning').text = str(
has_provisioning_profiles or False).lower()
if has_provisioning_profiles:
provisioning_profiles_xml = XML.SubElement(
xcode, 'provisioningProfiles')
mapping = [
('bundle-id', 'provisioningProfileAppId', ''),
('provisioning-profile-uuid', 'provisioningProfileUUID', '')
]
for provisioning_profile in data.get('provisioning-profiles'):
provisioning_profile_xml = XML.SubElement(
provisioning_profiles_xml, 'au.com.rayh.ProvisioningProfile')
convert_mapping_to_xml(provisioning_profile_xml,
provisioning_profile, mapping, fail_required=True)
def sonatype_clm(registry, xml_parent, data):
"""yaml: sonatype-clm

View File

@ -30,6 +30,7 @@
<keychainPath/>
<keychainPwd/>
<unlockKeychain>false</unlockKeychain>
<manualSigning>false</manualSigning>
</au.com.rayh.XCodeBuilder>
<au.com.rayh.DeveloperProfileLoader>
<id>849b07cd-ac61-4588-89c8-b6606ee84946</id>
@ -63,6 +64,17 @@
<keychainPath>/Users/jenkins/Library/Keychains/jenkins-uasdk-ios-pre_review</keychainPath>
<keychainPwd>testpass</keychainPwd>
<unlockKeychain>true</unlockKeychain>
<manualSigning>true</manualSigning>
<provisioningProfiles>
<au.com.rayh.ProvisioningProfile>
<provisioningProfileAppId>foo</provisioningProfileAppId>
<provisioningProfileUUID>bar</provisioningProfileUUID>
</au.com.rayh.ProvisioningProfile>
<au.com.rayh.ProvisioningProfile>
<provisioningProfileAppId>foo2</provisioningProfileAppId>
<provisioningProfileUUID>bar2</provisioningProfileUUID>
</au.com.rayh.ProvisioningProfile>
</provisioningProfiles>
</au.com.rayh.XCodeBuilder>
</builders>
</project>

View File

@ -22,3 +22,8 @@ builders:
keychain-path: "/Users/jenkins/Library/Keychains/jenkins-uasdk-ios-pre_review"
keychain-password: "testpass"
keychain-unlock: true
provisioning-profiles:
- bundle-id: foo
provisioning-profile-uuid: bar
- bundle-id: foo2
provisioning-profile-uuid: bar2