Skip to content

Actually use TargetOS=AnyOS in the build-test-job (Try 2) #61801

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jkoritzinsky merged 11 commits into from
Nov 22, 2021
Merged

Actually use TargetOS=AnyOS in the build-test-job (Try 2) #61801

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
b35bdbe
Revert "Revert "Actually use TargetOS=AnyOS in the build-test-job. (#…
jkoritzinsky Nov 18, 2021
2bd9f73
Try using just the variable name in format()
jkoritzinsky Nov 18, 2021
0866b6e
Put Build.SourcesDirectory into the formatted text directly.
jkoritzinsky Nov 18, 2021
bb46623
Forward override paths down to the inner builds.
jkoritzinsky Nov 18, 2021
ce3ad38
Fix System.Private.CoreLib reference to use the livebuilds paths.
jkoritzinsky Nov 19, 2021
984f46a
Fix casing for configs.
jkoritzinsky Nov 19, 2021
c8cf042
Merge branch 'anyos-try-2' of github.com:jkoritzinsky/runtime into an…
jkoritzinsky Nov 19, 2021
f529323
Use buildConfigUpper for the runtime override path.
jkoritzinsky Nov 19, 2021
138deec
Merge branch 'main' of github.com:dotnet/runtime into anyos-try-2
jkoritzinsky Nov 20, 2021
e7a3032
Now that we don't have a CoreLib dependency in the build job, do some…
jkoritzinsky Nov 20, 2021
d1d2454
Fix upload path
jkoritzinsky Nov 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion eng/pipelines/common/templates/runtimes/build-test-job.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ jobs:
- 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=$(Build.SourcesDirectory)/artifacts/bin/mono/{0}{1}.{2}.{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, coalesce(parameters.liveRuntimeBuildConfig, parameters.buildConfig)) }}
value: ${{ format('/p:CoreCLROverridePath=$(Build.SourcesDirectory)/artifacts/bin/coreclr/{0}{1}.{2}.{3}', 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) }}
Expand Down
3 changes: 2 additions & 1 deletion src/tests/Common/override.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@
>

<ItemGroup>
<ReferencePath Include="$(RepoRoot)\artifacts\bin\$(RuntimeFlavor)\$(TargetOS).$(TargetArchitecture).$(Configuration)\IL\System.Private.CoreLib.dll"/>
<ReferencePath Condition="'$(RuntimeFlavor)' == 'Mono'" Include="$(MonoArtifactsPath)\IL\System.Private.CoreLib.dll"/>
<ReferencePath Condition="'$(RuntimeFlavor)' != 'Mono'" Include="$(CoreCLRArtifactsPath)\IL\System.Private.CoreLib.dll"/>
</ItemGroup>
</Target>

Expand Down