Revert "Only notarize CI builds; timeout after 90 min (#7280)"
This reverts commit cd396d63cc
.
This commit is contained in:
Родитель
cd396d63cc
Коммит
e919ae7f7a
|
@ -481,6 +481,8 @@ timestamps {
|
||||||
}
|
}
|
||||||
|
|
||||||
stage ('Signing') {
|
stage ('Signing') {
|
||||||
|
def notarize_mac = true
|
||||||
|
def notarize_ios = true
|
||||||
def entitlements = "${workspace}/xamarin-macios/mac-entitlements.plist"
|
def entitlements = "${workspace}/xamarin-macios/mac-entitlements.plist"
|
||||||
currentStage = "${STAGE_NAME}"
|
currentStage = "${STAGE_NAME}"
|
||||||
echo ("Building on ${env.NODE_NAME}")
|
echo ("Building on ${env.NODE_NAME}")
|
||||||
|
@ -501,13 +503,13 @@ timestamps {
|
||||||
if (bundleZip.length > 0)
|
if (bundleZip.length > 0)
|
||||||
bundleZipFilename = bundleZip [0].name
|
bundleZipFilename = bundleZip [0].name
|
||||||
|
|
||||||
if (isPr) {
|
withCredentials ([string (credentialsId: 'codesign_keychain_pw', variable: 'PRODUCTSIGN_KEYCHAIN_PASSWORD')]) {
|
||||||
withCredentials ([string (credentialsId: 'codesign_keychain_pw', variable: 'PRODUCTSIGN_KEYCHAIN_PASSWORD')]) {
|
sh ("${workspace}/xamarin-macios/jenkins/productsign.sh")
|
||||||
sh ("${workspace}/xamarin-macios/jenkins/productsign.sh")
|
}
|
||||||
}
|
|
||||||
} else {
|
if (notarize_mac || notarize_ios) {
|
||||||
try {
|
try {
|
||||||
pkgs = xiPackages + xmPackages
|
pkgs = []
|
||||||
if (fileExists('release-scripts')) {
|
if (fileExists('release-scripts')) {
|
||||||
dir('release-scripts') {
|
dir('release-scripts') {
|
||||||
sh ('git checkout sign-and-notarized && git pull')
|
sh ('git checkout sign-and-notarized && git pull')
|
||||||
|
@ -515,12 +517,14 @@ timestamps {
|
||||||
} else {
|
} else {
|
||||||
sh ('git clone git@github.com:xamarin/release-scripts -b sign-and-notarized')
|
sh ('git clone git@github.com:xamarin/release-scripts -b sign-and-notarized')
|
||||||
}
|
}
|
||||||
|
if (notarize_mac)
|
||||||
|
pkgs = pkgs + xmPackages
|
||||||
|
if (notarize_ios)
|
||||||
|
pkgs = pkgs + xiPackages
|
||||||
withCredentials([string(credentialsId: 'codesign_keychain_pw', variable: 'KEYCHAIN_PASS'), string(credentialsId: 'team_id', variable: 'TEAM_ID'), string(credentialsId: 'application_id', variable: 'APP_ID'), string(credentialsId: 'installer_id', variable: 'INSTALL_ID'), usernamePassword(credentialsId: 'apple_account', passwordVariable: 'APPLE_PASS', usernameVariable: 'APPLE_ACCOUNT')]) {
|
withCredentials([string(credentialsId: 'codesign_keychain_pw', variable: 'KEYCHAIN_PASS'), string(credentialsId: 'team_id', variable: 'TEAM_ID'), string(credentialsId: 'application_id', variable: 'APP_ID'), string(credentialsId: 'installer_id', variable: 'INSTALL_ID'), usernamePassword(credentialsId: 'apple_account', passwordVariable: 'APPLE_PASS', usernameVariable: 'APPLE_ACCOUNT')]) {
|
||||||
sh (returnStatus: true, script: "security create-keychain -p ${env.KEYCHAIN_PASS} login.keychain") // needed to repopulate the keychain
|
sh (returnStatus: true, script: "security create-keychain -p ${env.KEYCHAIN_PASS} login.keychain") // needed to repopulate the keychain
|
||||||
sh ("security unlock-keychain -p ${env.KEYCHAIN_PASS} login.keychain")
|
sh ("security unlock-keychain -p ${env.KEYCHAIN_PASS} login.keychain")
|
||||||
timeout(time: 90, unit: 'MINUTES') {
|
sh ("python release-scripts/sign_and_notarize.py -a ${env.APP_ID} -i ${env.INSTALL_ID} -u ${env.APPLE_ACCOUNT} -p ${env.APPLE_PASS} -t ${env.TEAM_ID} -d package/notarized -e ${entitlements} -k login.keychain " + pkgs.flatten().join(" "))
|
||||||
sh ("python release-scripts/sign_and_notarize.py -a ${env.APP_ID} -i ${env.INSTALL_ID} -u ${env.APPLE_ACCOUNT} -p ${env.APPLE_PASS} -t ${env.TEAM_ID} -d package/notarized -e ${entitlements} -k login.keychain " + pkgs.flatten ().join (" "))
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
def xiNotarizedPackages = findFiles (glob: "package/notarized/xamarin.ios-*.pkg")
|
def xiNotarizedPackages = findFiles (glob: "package/notarized/xamarin.ios-*.pkg")
|
||||||
|
@ -539,6 +543,7 @@ timestamps {
|
||||||
echo "\t${stack}"
|
echo "\t${stack}"
|
||||||
}
|
}
|
||||||
manager.addWarningBadge("PKGs are not notarized")
|
manager.addWarningBadge("PKGs are not notarized")
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Загрузка…
Ссылка в новой задаче