Skip to content

Commit

Permalink
Add MacOS & Linux to CI; MacOS & Linux test fixes (dotnet#293)
Browse files Browse the repository at this point in the history
  • Loading branch information
daholste authored Mar 17, 2019
1 parent 9603fc4 commit 990cfbd
Show file tree
Hide file tree
Showing 4 changed files with 79 additions and 3 deletions.
23 changes: 23 additions & 0 deletions .vsts-dotnet-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,29 @@ resources:
image: microsoft/dotnet-buildtools-prereqs:centos-7-b46d863-20180719033416

phases:

- template: /build/ci/phase-template.yml
parameters:
name: Centos
buildScript: ./build.sh
customMatrixes:
Build_Debug_Intrinsics:
_configuration: Debug-Intrinsics
_config_short: DI
Build_Release:
_configuration: Release
_config_short: R
queue:
name: Hosted Ubuntu 1604
container: LinuxContainer

- template: /build/ci/phase-template.yml
parameters:
name: MacOS
buildScript: ./build.sh
queue:
name: Hosted macOS

- template: /build/ci/phase-template.yml
parameters:
name: Windows_x64
Expand Down
4 changes: 2 additions & 2 deletions build.proj
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,8 @@
</Target>-->

<Target Name="RunTests">
<MSBuild Projects="src\test\run-tests.proj" Targets="RunTests" />
<MSBuild Projects="src\mlnet.test\run-tests.proj" Targets="RunTests" />
<MSBuild Projects="src\Test\run-tests.proj" Targets="RunTests" />
<MSBuild Projects="src\mlnet.Test\run-tests.proj" Targets="RunTests" />
</Target>

<!-- Override CleanAllProjects from dir.traversal.targets and just remove the full BinDir -->
Expand Down
53 changes: 53 additions & 0 deletions build/vsts-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,57 @@ resources:

phases:

################################################################################
- phase: Linux
################################################################################
variables:
BuildConfig: Release
OfficialBuildId: $(BUILD.BUILDNUMBER)
DOTNET_CLI_TELEMETRY_OPTOUT: 1
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1
DOTNET_MULTILEVEL_LOOKUP: 0
queue:
name: DotNet-Build
demands:
- agent.os -equals linux
container: LinuxContainer
steps:
# Only build native assets to avoid conflicts.
- script: ./build.sh -buildNative -$(BuildConfig) -skipRIDAgnosticAssets
displayName: Build

- task: PublishBuildArtifacts@1
displayName: Publish Linux package assets
inputs:
pathToPublish: $(Build.SourcesDirectory)/bin/obj/packages
artifactName: PackageAssets
artifactType: container

################################################################################
- phase: MacOS
################################################################################
variables:
BuildConfig: Release
OfficialBuildId: $(BUILD.BUILDNUMBER)
DOTNET_CLI_TELEMETRY_OPTOUT: 1
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1
DOTNET_MULTILEVEL_LOOKUP: 0
queue:
name: DotNetCore-Build
demands:
- agent.os -equals Darwin
steps:
# Only build native assets to avoid conflicts.
- script: ./build.sh -buildNative -$(BuildConfig) -skipRIDAgnosticAssets
displayName: Build

- task: PublishBuildArtifacts@1
displayName: Publish macOS package assets
inputs:
pathToPublish: $(Build.SourcesDirectory)/bin/obj/packages
artifactName: PackageAssets
artifactType: container

################################################################################
- phase: Windows_x64
################################################################################
Expand Down Expand Up @@ -39,6 +90,8 @@ phases:
- phase: Package
################################################################################
dependsOn:
- Linux
- MacOS
- Windows_x64
variables:
BuildConfig: Release
Expand Down
2 changes: 1 addition & 1 deletion src/mlnet.Test/CommandLineTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ public void TestCommandLineArgsValuesTest()
var validDataset = Path.GetTempFileName();
var labelName = "Label";
var name = "testname";
var outputPath = "x:\\mlnet";
var outputPath = Path.GetTempPath();
var falseString = "false";

// Create handler outside so that commandline and the handler is decoupled and testable.
Expand Down

0 comments on commit 990cfbd

Please sign in to comment.