Skip to content

Add fixes to prevent potential build failures due to redist copying #1775

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
merged 4 commits into from
Nov 29, 2018
Merged

Add fixes to prevent potential build failures due to redist copying #1775

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0bfaa5d
Prevent models from copying from each leg
vaeksare Nov 28, 2018
f03a4cd
Copying now checks for condition
vaeksare Nov 29, 2018
c1428ce
Add correct property
vaeksare Nov 29, 2018
b0ccde3
Minor change to condition logic
vaeksare Nov 29, 2018
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
6 changes: 3 additions & 3 deletions build/vsts-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ phases:
container: LinuxContainer
steps:
# Only build native assets to avoid conflicts.
- script: ./build.sh -buildNative -$(BuildConfig)
- script: ./build.sh -buildNative -$(BuildConfig) -skipRIDAgnosticAssets
displayName: Build

- task: PublishBuildArtifacts@1
Expand All @@ -49,7 +49,7 @@ phases:
- agent.os -equals Darwin
steps:
# Only build native assets to avoid conflicts.
- script: ./build.sh -buildNative -$(BuildConfig)
- script: ./build.sh -buildNative -$(BuildConfig) -skipRIDAgnosticAssets
displayName: Build

- task: PublishBuildArtifacts@1
Expand Down Expand Up @@ -89,7 +89,7 @@ phases:
condition: and(succeeded(), in(variables._SignType, 'real', 'test'))

# Only build native assets to avoid conflicts.
- script: ./build.cmd -buildNative -$(BuildConfig) -buildArch=x86
- script: ./build.cmd -buildNative -$(BuildConfig) -buildArch=x86 -skipRIDAgnosticAssets
displayName: Build

- task: MSBuild@1
Expand Down
12 changes: 12 additions & 0 deletions config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,12 @@
"values": [],
"defaultValue": ""
},
"SkipRIDAgnosticAssets": {
"description": "Prevents RID agnostic assets in redist from being built.",
"valueType": "property",
"values": [],
"defaultValue": ""
},
"MsBuildLogging": {
"description": "MsBuild logging options.",
"valueType": "passThrough",
Expand Down Expand Up @@ -118,6 +124,12 @@
"BuildNative": "default"
}
},
"skipRIDAgnosticAssets": {
"description": "Avoid building RID agnostic assets in redist.",
"settings": {
"SkipRIDAgnosticAssets": "default"
}
},
"buildPackages": {
"description": "Builds the NuGet packages.",
"settings": {
Expand Down
1 change: 1 addition & 0 deletions ...rosoft.ML.DnnImageFeaturizer.ModelRedist/Microsoft.ML.DnnImageFeaturizer.ModelRedist.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@
DependsOnTargets="DownloadDnnModelFiles">
<Message Importance="High" Text="Copying external model files... @(ModelFileCopy->'%(TargetPath)')" />
<Copy SourceFiles="@(ModelFileCopy)"
Condition="'$(SkipRIDAgnosticAssets)' != 'true'"
DestinationFiles="@(ModelFileCopy->'%(TargetPath)')" />
</Target>

Expand Down