diff options
| author | Jeremy Koritzinsky <jekoritz@microsoft.com> | 2021-11-18 20:43:05 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-18 20:43:05 +0300 |
| commit | 6ff57f1935d1cb3396674bec26268a301e5c0628 (patch) | |
| tree | 0b9fbde4b709685a347da706e6276cc527555cab /eng/pipelines/common/templates/runtimes/build-test-job.yml | |
| parent | c0dabb527176d1fdb6ba7bdca75fd80d69482be2 (diff) | |
Actually use TargetOS=AnyOS in the build-test-job. (#61745)
Diffstat (limited to 'eng/pipelines/common/templates/runtimes/build-test-job.yml')
| -rw-r--r-- | eng/pipelines/common/templates/runtimes/build-test-job.yml | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/eng/pipelines/common/templates/runtimes/build-test-job.yml b/eng/pipelines/common/templates/runtimes/build-test-job.yml index 562b426eebc..9c17307ed47 100644 --- a/eng/pipelines/common/templates/runtimes/build-test-job.yml +++ b/eng/pipelines/common/templates/runtimes/build-test-job.yml @@ -89,9 +89,13 @@ jobs: - ${{ if eq(parameters.runtimeFlavor, 'coreclr') }}: - name: liveRuntimeBuildParams value: ${{ format('clr.corelib+libs.ref+libs.native -rc {0} -c {1} -arch {2} -ci', coalesce(parameters.liveRuntimeBuildConfig, parameters.buildConfig), parameters.liveLibrariesBuildConfig, parameters.archType) }} + - name: liveRuntimeArtifactsPathArg + value: ${{ format('/p:CoreCLROverridePath={0}/artifacts/bin/coreclr/{1}{2}.{3}.{4}', $(Build.SourcesDirectory), parameters.osGroup, parameters.osSubgroup, parameters.archType, coalesce(parameters.liveRuntimeBuildConfig, parameters.buildConfig)) }} - ${{ if eq(parameters.runtimeFlavor, 'mono') }}: - name: liveRuntimeBuildParams value: ${{ format('mono.corelib+libs.ref+libs.native -rc {0} -c {1} -arch {2} -ci', coalesce(parameters.liveRuntimeBuildConfig, parameters.buildConfig), parameters.liveLibrariesBuildConfig, parameters.archType) }} + - name: liveRuntimeArtifactsPathArg + value: ${{ format('/p:MonoOverridePath={0}/artifacts/bin/mono/{1}{2}.{3}.{4}', $(Build.SourcesDirectory), parameters.osGroup, parameters.osSubgroup, parameters.archType, coalesce(parameters.liveRuntimeBuildConfig, parameters.buildConfig)) }} - name: compilerArg value: '' - ${{ if and(ne(parameters.osGroup, 'windows'), ne(parameters.compilerName, 'gcc')) }}: @@ -135,7 +139,7 @@ jobs: displayName: Disk Usage before Build # Build managed test components - - script: $(Build.SourcesDirectory)/src/tests/build$(scriptExt) $(logRootNameArg)Managed allTargets skipnative skipgeneratelayout skiptestwrappers $(buildConfig) $(archType) $(runtimeFlavorArgs) $(crossArg) $(priorityArg) ci $(librariesOverrideArg) + - script: $(Build.SourcesDirectory)/src/tests/build$(scriptExt) $(logRootNameArg)Managed allTargets skipnative skipgeneratelayout skiptestwrappers $(buildConfig) $(archType) $(runtimeFlavorArgs) $(crossArg) $(priorityArg) ci $(librariesOverrideArg) /p:RuntimeOS=${{ parameters.osGroup }}${{ parameters.osSubgroup }} /p:LibrariesTargetOSConfigurationArchitecture=${{ parameters.osGroup }}${{ parameters.osSubgroup }}-${{ parameters.liveLibrariesBuildConfig }}-${{ parameters.archType }} $(liveRuntimeArtifactsPathArg) /p:TargetOS=AnyOS displayName: Build managed test components - ${{ if in(parameters.osGroup, 'OSX', 'iOS', 'tvOS') }}: @@ -147,7 +151,7 @@ jobs: # Zip and publish managed test components - template: /eng/pipelines/common/upload-artifact-step.yml parameters: - rootFolder: $(managedTestArtifactRootFolderPath) + rootFolder: '$(binTestsPath)/AnyOS.$(archType).$(buildConfigUpper)' includeRootFolder: false archiveExtension: '.tar.gz' archiveType: tar |