diff options
author | Alexander Köplinger <alex.koeplinger@outlook.com> | 2021-02-19 00:16:29 +0300 |
---|---|---|
committer | Alexander Köplinger <alex.koeplinger@outlook.com> | 2021-02-19 00:16:29 +0300 |
commit | a8f265550b3b7fb82dd923fd47279248e6008eb3 (patch) | |
tree | a27686e4fa1fd0e4bdff252905acc1917c1b7a5c | |
parent | c621c35ffa03273dbfb83055c7587c6a6617295a (diff) |
Remove signing from Jenkins PKG/MSI pipelinesmono-6.12.0.123
It's handled differently now.
-rw-r--r-- | scripts/ci/pipeline/osx-package.groovy | 24 | ||||
-rw-r--r-- | scripts/ci/pipeline/win-package.groovy | 11 |
2 files changed, 6 insertions, 29 deletions
diff --git a/scripts/ci/pipeline/osx-package.groovy b/scripts/ci/pipeline/osx-package.groovy index 7dc74e31221..6c2057a2dca 100644 --- a/scripts/ci/pipeline/osx-package.groovy +++ b/scripts/ci/pipeline/osx-package.groovy @@ -1,4 +1,4 @@ -isPrivate = (env.JENKINS_URL ==~ /.*jenkins\.internalx\.com.*/ ? true : false) +isPrivate = false isPr = (env.ghprbPullId && !env.ghprbPullId.empty ? true : false) monoBranch = (isPr ? "pr" : env.BRANCH_NAME) isReleaseJob = (!isPr && monoBranch ==~ /20\d\d-\d\d/) // check if we're on a 2017-xx branch, i.e. release @@ -42,8 +42,6 @@ try { } stage('Build') { - utils.reportGitHubStatus (isPr ? env.ghprbActualCommit : commitHash, 'PKG-mono', env.BUILD_URL, 'PENDING', 'Building...') - // build the .pkg timeout (time: 420, unit: 'MINUTES') { withEnv (["MONO_BRANCH=${isPr ? '' : monoBranch}", "MONO_BUILD_REVISION=${commitHash}"]) { @@ -65,7 +63,7 @@ try { azureUpload(storageCredentialId: (isPrivate ? "bc6a99d18d7d9ca3f6bf6b19e364d564" : "fbd29020e8166fbede5518e038544343"), storageType: "blobstorage", containerName: "${jobName}", - virtualPath: "${monoBranch}/${env.BUILD_NUMBER}/${commitHash}/", + virtualPath: "${monoBranch}/${env.BUILD_NUMBER}/${commitHash}/unsigned/", filesPath: "${packageFileName},mac-entitlements.plist", allowAnonymousAccess: (isPrivate ? false : true), pubAccessible: (isPrivate ? false : true), @@ -77,25 +75,9 @@ try { } } - if (isReleaseJob) { - stage("Signing") { - timeout(time: 90, unit: 'MINUTES') { - // waits until the signing job posts completion signal to this pipeline input - input id: 'FinishedSigning', message: 'Waiting for signing to finish (please be patient)...', submitter: 'monojenkins' - echo "Signing done." - } - } - } - else { - echo "Not a release job, skipping signing." - } - def downloadHost = (isPrivate ? "dl.internalx.com" : "xamjenkinsartifact.azureedge.net") - def packageUrl = "https://${downloadHost}/${jobName}/${monoBranch}/${env.BUILD_NUMBER}/${commitHash}" + def packageUrl = "https://${downloadHost}/${jobName}/${monoBranch}/${env.BUILD_NUMBER}/${commitHash}/unsigned" currentBuild.description = "<hr/><h2>DOWNLOAD: <a href=\"${packageUrl}/${packageFileName}\">${packageFileName}</a></h2><hr/>" - - if (isReleaseJob) { utils.reportGitHubStatus (isPr ? env.ghprbActualCommit : commitHash, 'artifacts.json', "${packageUrl}/artifacts.json", 'SUCCESS', '') } - utils.reportGitHubStatus (isPr ? env.ghprbActualCommit : commitHash, 'PKG-mono', "${packageUrl}/${packageFileName}", 'SUCCESS', packageFileName) } } catch (Exception e) { diff --git a/scripts/ci/pipeline/win-package.groovy b/scripts/ci/pipeline/win-package.groovy index 322831d7733..e7d25832484 100644 --- a/scripts/ci/pipeline/win-package.groovy +++ b/scripts/ci/pipeline/win-package.groovy @@ -41,9 +41,6 @@ try { } stage('Build') { - utils.reportGitHubStatus (isPr ? env.ghprbActualCommit : commitHash, 'MSI-mono_x86', env.BUILD_URL, 'PENDING', 'Building...') - utils.reportGitHubStatus (isPr ? env.ghprbActualCommit : commitHash, 'MSI-mono_x64', env.BUILD_URL, 'PENDING', 'Building...') - // build the .msi timeout (time: 420, unit: 'MINUTES') { def macPackageName = sh (script: "ls MonoFramework-MDK-*.pkg", returnStdout: true).trim() @@ -77,7 +74,7 @@ try { azureUpload(storageCredentialId: "fbd29020e8166fbede5518e038544343", storageType: "blobstorage", containerName: "${jobName}", - virtualPath: "${monoBranch}/${env.BUILD_NUMBER}/${commitHash}/", + virtualPath: "${monoBranch}/${env.BUILD_NUMBER}/${commitHash}/unsigned/", filesPath: "${packageFileNameX86},${packageFileNameX64}", allowAnonymousAccess: true, pubAccessible: true, @@ -102,12 +99,10 @@ try { echo "Not a release job, skipping signing." } - def packageUrlX86 = "https://xamjenkinsartifact.azureedge.net/${jobName}/${monoBranch}/${env.BUILD_NUMBER}/${commitHash}/${packageFileNameX86}" - def packageUrlX64 = "https://xamjenkinsartifact.azureedge.net/${jobName}/${monoBranch}/${env.BUILD_NUMBER}/${commitHash}/${packageFileNameX64}"; + def packageUrlX86 = "https://xamjenkinsartifact.azureedge.net/${jobName}/${monoBranch}/${env.BUILD_NUMBER}/${commitHash}/unsigned/${packageFileNameX86}" + def packageUrlX64 = "https://xamjenkinsartifact.azureedge.net/${jobName}/${monoBranch}/${env.BUILD_NUMBER}/${commitHash}/unsigned/${packageFileNameX64}"; currentBuild.description = "<hr/><h2>DOWNLOAD: <a href=\"${packageUrlX86}\">${packageFileNameX86}</a> -- <a href=\"${packageUrlX64}\">${packageFileNameX64}</a></h2><hr/>" - utils.reportGitHubStatus (isPr ? env.ghprbActualCommit : commitHash, 'MSI-mono_x86', packageUrlX86, 'SUCCESS', packageFileNameX86) - utils.reportGitHubStatus (isPr ? env.ghprbActualCommit : commitHash, 'MSI-mono_x64', packageUrlX64, 'SUCCESS', packageFileNameX64) } } catch (Exception e) { |