diff --git a/eng/pipelines/common/global-build-job.yml b/eng/pipelines/common/global-build-job.yml index 7358870892a..23f02b82ea5 100644 --- a/eng/pipelines/common/global-build-job.yml +++ b/eng/pipelines/common/global-build-job.yml @@ -24,6 +24,7 @@ parameters: condition: true useContinueOnErrorDuringBuild: false shouldContinueOnError: false + enableSigning: '' isOfficialBuild: false runtimeFlavor: 'coreclr' runtimeVariant: '' @@ -52,8 +53,8 @@ jobs: timeoutInMinutes: ${{ parameters.timeoutInMinutes }} enablePublishTestResults: ${{ parameters.enablePublishTestResults }} testResultsFormat: ${{ parameters.testResultsFormat }} - enableMicrobuild: ${{ parameters.isOfficialBuild }} - enableMicrobuildForMacAndLinux: ${{ parameters.isOfficialBuild }} + enableMicrobuild: ${{ coalesce(parameters.enableSigning, parameters.isOfficialBuild) }} + enableMicrobuildForMacAndLinux: ${{ coalesce(parameters.enableSigning, parameters.isOfficialBuild) }} templateContext: ${{ parameters.templateContext }} artifacts: diff --git a/eng/pipelines/official/jobs/prepare-signed-artifacts.yml b/eng/pipelines/official/jobs/prepare-signed-artifacts.yml index f102ee9dee5..b4177e7b641 100644 --- a/eng/pipelines/official/jobs/prepare-signed-artifacts.yml +++ b/eng/pipelines/official/jobs/prepare-signed-artifacts.yml @@ -26,9 +26,13 @@ jobs: - ${{ if eq(parameters.isOfficialBuild, true) }}: - name: '_SignType' value: $[ coalesce(variables.OfficialSignType, 'real') ] + - name: _SignArgs + value: -sign - ${{ else }}: - name: '_SignType' value: $[ coalesce(variables.OfficialSignType, 'test') ] + - name: _SignArgs + value: '' templateContext: inputs: @@ -48,7 +52,8 @@ jobs: steps: - script: >- - build.cmd -restore -sign -publish -ci -configuration Release + build.cmd -restore -publish -ci -configuration Release + $(_SignArgs) /p:RestoreToolsetOnly=true /p:PublishRidAgnosticPackagesFromPlatform=${{ parameters.PublishRidAgnosticPackagesFromPlatform }} /p:DownloadDirectory=$(Build.SourcesDirectory)\artifacts\PackageDownload\ diff --git a/eng/pipelines/runtimelab-official.yml b/eng/pipelines/runtimelab-official.yml index 28eeacc4a5c..4ce7dfe4985 100644 --- a/eng/pipelines/runtimelab-official.yml +++ b/eng/pipelines/runtimelab-official.yml @@ -43,6 +43,7 @@ extends: jobParameters: templatePath: 'templates-official' timeoutInMinutes: 300 + enableSigning: false isOfficialBuild: true testGroup: innerloop buildArgs: -s clr.aot+libs -c $(_BuildConfig)