Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
21 changes: 21 additions & 0 deletions .vsts-dotnet-ci.yml
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
resources:

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we move this file from the root of the repo and instead put it in the build folder?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I left it in the root because if it is in the root we get Resource Authorization automatically:
https://github.com/Microsoft/vsts-agent/blob/master/docs/preview/yamlgettingstarted-authz.md

They do have plans on supporting directory structure for this though:
microsoft/azure-pipelines-agent#1430

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That is unfortunate.

containers:
- container: centos7
image: microsoft/dotnet-buildtools-prereqs:centos-7-b46d863-20180719033416

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

dotnet-buildtools-prereqs:centos-7-b46d863-20180719033416 [](start = 21, length = 57)

does this docker image contains libgdiplus?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@safernsafernJul 23, 2018

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I’m trying to build and run the tests locally in my computer with the same container. I’ll update you. Using your branch of course

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The tests that you added passed in my machine when using that docker image. I just need to dig why they are failing in VSTS, maybe not picking the right docker image. I'll update you.


phases:
- template: /build/ci/phase-template.yml
parameters:
name: Linux
buildScript: ./build.sh
queue:
container: centos7

- template: /build/ci/phase-template.yml
parameters:
name: Windows_NT

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Windows_NT [](start = 10, length = 10)

I obviously don't have knowleage regarding build system, but from what I see we have 4 nodes in VSTS where Windows_NT is not running, and also Windows builds on jenkins.
Is it intended?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So the jenkins Windows builds will stop showing up after I merge this PR. They keep showing because it takes the checked-in netci.groovy file instead of taking the one in this PR.

About the VSTS nodes, you can see here: https://dotnet.visualstudio.com/public/_build/results?buildId=7047&view=logs that the new Build Def, will run Linux and Windows in both Release and Debug mode simultaneously.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Got it, thank you for clarification.

buildScript: build.cmd
queue:
name: Hosted VS2017
demands:
- agent.os -equals Windows_NT
4 changes: 2 additions & 2 deletions README.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,9 +44,9 @@ To build ML.NET from source please visit our [developers guide](docs/project-doc

| | x64 Debug | x64 Release |
|:---|----------------:|------------------:|
|**Linux**|[![x64-debug](https://ci2.dot.net/job/dotnet_machinelearning/job/master/job/linux_debug/badge/icon)](https://ci2.dot.net/job/dotnet_machinelearning/job/master/job/linux_debug/lastCompletedBuild)|[![x64-release](https://ci2.dot.net/job/dotnet_machinelearning/job/master/job/linux_release/badge/icon)](https://ci2.dot.net/job/dotnet_machinelearning/job/master/job/linux_release/lastCompletedBuild)|
|**Linux**|[![x64-debug](https://dotnet.visualstudio.com/public/_apis/build/status/104?branch=master)](https://dotnet.visualstudio.com/DotNet-Public/_build/latest?definitionId=104&branch=master)|[![x64-release](https://dotnet.visualstudio.com/public/_apis/build/status/104?branch=master)](https://dotnet.visualstudio.com/DotNet-Public/_build/latest?definitionId=104&branch=master)|
|**macOS**|[![x64-debug](https://ci2.dot.net/job/dotnet_machinelearning/job/master/job/osx10.13_debug/badge/icon)](https://ci2.dot.net/job/dotnet_machinelearning/job/master/job/osx10.13_debug/lastCompletedBuild)|[![x64-release](https://ci2.dot.net/job/dotnet_machinelearning/job/master/job/osx10.13_release/badge/icon)](https://ci2.dot.net/job/dotnet_machinelearning/job/master/job/osx10.13_release/lastCompletedBuild)|
|**Windows**|[![x64-debug](https://ci2.dot.net/job/dotnet_machinelearning/job/master/job/windows_nt_debug/badge/icon)](https://ci2.dot.net/job/dotnet_machinelearning/job/master/job/windows_nt_debug/lastCompletedBuild)|[![x64-release](https://ci2.dot.net/job/dotnet_machinelearning/job/master/job/windows_nt_release/badge/icon)](https://ci2.dot.net/job/dotnet_machinelearning/job/master/job/windows_nt_release/lastCompletedBuild)|
|**Windows**|[![x64-debug](https://dotnet.visualstudio.com/public/_apis/build/status/104?branch=master)](https://dotnet.visualstudio.com/DotNet-Public/_build/latest?definitionId=104&branch=master)|[![x64-release](https://dotnet.visualstudio.com/public/_apis/build/status/104?branch=master)](https://dotnet.visualstudio.com/DotNet-Public/_build/latest?definitionId=104&branch=master)|

## Contributing

Expand Down
33 changes: 33 additions & 0 deletions build/ci/phase-template.yml
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
parameters:
name: ''
buildScript: ''
queue: {}

phases:
- phase: ${{ parameters.name }}
variables:
_buildScript: ${{ parameters.buildScript }}
_phaseName: ${{ parameters.name }}
queue:
parallel: 2
matrix:
Build_Debug:
_configuration: Debug
Build_Release:
_configuration: Release
${{ insert }}: ${{ parameters.queue }}
steps:
- script: $(_buildScript) -$(_configuration) -runtests
displayName: Build and Test
- task: PublishTestResults@2
displayName: Publish Test Results
condition: succeededOrFailed()
inputs:
testRunner: 'vSTest'

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

vSTest [](start = 21, length = 6)

don't we use xUnit tests, or they interchangeable?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We use xunit as a framework, but we use VSTest as our test runner:
https://github.com/dotnet/machinelearning/blob/master/test/run-tests.proj#L10

searchFolder: '$(System.DefaultWorkingDirectory)/bin'
testResultsFiles: '**/*.trx'
testRunTitle: Machinelearning_Tests_$(_phaseName)_$(_configuration)_$(Build.BuildNumber)
configuration: $(_configuration)
mergeTestResults: true
- script: $(_buildScript) -buildPackages
displayName: Build Packages
32 changes: 4 additions & 28 deletions netci.groovy
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,46 +6,22 @@ import jobs.generation.Utilities;
def project = GithubProject
def branch = GithubBranchName

['Windows_NT', 'Linux', 'OSX10.13'].each { os ->
['OSX10.13'].each { os ->
['Debug', 'Release'].each { config ->
[true, false].each { isPR ->
// Calculate job name
def jobName = os.toLowerCase() + '_' + config.toLowerCase()
def buildFile = '';

def machineAffinity = 'latest-or-auto'

// Calculate the build command
if (os == 'Windows_NT') {
buildFile = ".\\build.cmd"
} else {
buildFile = "./build.sh"
}

def buildCommand = buildFile + " -$config -runtests"
def packCommand = buildFile + " -buildPackages"

def newJob = job(Utilities.getFullJobName(project, jobName, isPR)) {
steps {
if (os == 'Windows_NT') {
batchFile(buildCommand)
batchFile(packCommand)
}
else {
// Shell
shell(buildCommand)
shell(packCommand)
}
shell("./build.sh -$config -runtests")
shell("./build.sh -buildPackages")
}
}

def osImageName = os
if (os == 'Linux') {
// Trigger a portable Linux build that runs on RHEL7.2
osImageName = "RHEL7.2"
}

Utilities.setMachineAffinity(newJob, osImageName, machineAffinity)
Utilities.setMachineAffinity(newJob, os, machineAffinity)
Utilities.standardJobSetup(newJob, project, isPR, "*/${branch}")

if (isPR) {
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
21 changes: 21 additions & 0 deletions .vsts-dotnet-ci.yml
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
resources:

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we move this file from the root of the repo and instead put it in the build folder?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I left it in the root because if it is in the root we get Resource Authorization automatically:
https://github.com/Microsoft/vsts-agent/blob/master/docs/preview/yamlgettingstarted-authz.md

They do have plans on supporting directory structure for this though:
microsoft/azure-pipelines-agent#1430

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That is unfortunate.

containers:
- container: centos7
image: microsoft/dotnet-buildtools-prereqs:centos-7-b46d863-20180719033416

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

dotnet-buildtools-prereqs:centos-7-b46d863-20180719033416 [](start = 21, length = 57)

does this docker image contains libgdiplus?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@safernsafernJul 23, 2018

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I’m trying to build and run the tests locally in my computer with the same container. I’ll update you. Using your branch of course

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The tests that you added passed in my machine when using that docker image. I just need to dig why they are failing in VSTS, maybe not picking the right docker image. I'll update you.


phases:
- template: /build/ci/phase-template.yml
parameters:
name: Linux
buildScript: ./build.sh
queue:
container: centos7

- template: /build/ci/phase-template.yml
parameters:
name: Windows_NT

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Windows_NT [](start = 10, length = 10)

I obviously don't have knowleage regarding build system, but from what I see we have 4 nodes in VSTS where Windows_NT is not running, and also Windows builds on jenkins.
Is it intended?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So the jenkins Windows builds will stop showing up after I merge this PR. They keep showing because it takes the checked-in netci.groovy file instead of taking the one in this PR.

About the VSTS nodes, you can see here: https://dotnet.visualstudio.com/public/_build/results?buildId=7047&view=logs that the new Build Def, will run Linux and Windows in both Release and Debug mode simultaneously.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Got it, thank you for clarification.

buildScript: build.cmd
queue:
name: Hosted VS2017
demands:
- agent.os -equals Windows_NT
4 changes: 2 additions & 2 deletions README.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,9 +44,9 @@ To build ML.NET from source please visit our [developers guide](docs/project-doc

| | x64 Debug | x64 Release |
|:---|----------------:|------------------:|
|**Linux**|[![x64-debug](https://ci2.dot.net/job/dotnet_machinelearning/job/master/job/linux_debug/badge/icon)](https://ci2.dot.net/job/dotnet_machinelearning/job/master/job/linux_debug/lastCompletedBuild)|[![x64-release](https://ci2.dot.net/job/dotnet_machinelearning/job/master/job/linux_release/badge/icon)](https://ci2.dot.net/job/dotnet_machinelearning/job/master/job/linux_release/lastCompletedBuild)|
|**Linux**|[![x64-debug](https://dotnet.visualstudio.com/public/_apis/build/status/104?branch=master)](https://dotnet.visualstudio.com/DotNet-Public/_build/latest?definitionId=104&branch=master)|[![x64-release](https://dotnet.visualstudio.com/public/_apis/build/status/104?branch=master)](https://dotnet.visualstudio.com/DotNet-Public/_build/latest?definitionId=104&branch=master)|
|**macOS**|[![x64-debug](https://ci2.dot.net/job/dotnet_machinelearning/job/master/job/osx10.13_debug/badge/icon)](https://ci2.dot.net/job/dotnet_machinelearning/job/master/job/osx10.13_debug/lastCompletedBuild)|[![x64-release](https://ci2.dot.net/job/dotnet_machinelearning/job/master/job/osx10.13_release/badge/icon)](https://ci2.dot.net/job/dotnet_machinelearning/job/master/job/osx10.13_release/lastCompletedBuild)|
|**Windows**|[![x64-debug](https://ci2.dot.net/job/dotnet_machinelearning/job/master/job/windows_nt_debug/badge/icon)](https://ci2.dot.net/job/dotnet_machinelearning/job/master/job/windows_nt_debug/lastCompletedBuild)|[![x64-release](https://ci2.dot.net/job/dotnet_machinelearning/job/master/job/windows_nt_release/badge/icon)](https://ci2.dot.net/job/dotnet_machinelearning/job/master/job/windows_nt_release/lastCompletedBuild)|
|**Windows**|[![x64-debug](https://dotnet.visualstudio.com/public/_apis/build/status/104?branch=master)](https://dotnet.visualstudio.com/DotNet-Public/_build/latest?definitionId=104&branch=master)|[![x64-release](https://dotnet.visualstudio.com/public/_apis/build/status/104?branch=master)](https://dotnet.visualstudio.com/DotNet-Public/_build/latest?definitionId=104&branch=master)|

## Contributing

Expand Down
33 changes: 33 additions & 0 deletions build/ci/phase-template.yml
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
parameters:
name: ''
buildScript: ''
queue: {}

phases:
- phase: ${{ parameters.name }}
variables:
_buildScript: ${{ parameters.buildScript }}
_phaseName: ${{ parameters.name }}
queue:
parallel: 2
matrix:
Build_Debug:
_configuration: Debug
Build_Release:
_configuration: Release
${{ insert }}: ${{ parameters.queue }}
steps:
- script: $(_buildScript) -$(_configuration) -runtests
displayName: Build and Test
- task: PublishTestResults@2
displayName: Publish Test Results
condition: succeededOrFailed()
inputs:
testRunner: 'vSTest'

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

vSTest [](start = 21, length = 6)

don't we use xUnit tests, or they interchangeable?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We use xunit as a framework, but we use VSTest as our test runner:
https://github.com/dotnet/machinelearning/blob/master/test/run-tests.proj#L10

searchFolder: '$(System.DefaultWorkingDirectory)/bin'
testResultsFiles: '**/*.trx'
testRunTitle: Machinelearning_Tests_$(_phaseName)_$(_configuration)_$(Build.BuildNumber)
configuration: $(_configuration)
mergeTestResults: true
- script: $(_buildScript) -buildPackages
displayName: Build Packages
32 changes: 4 additions & 28 deletions netci.groovy
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,46 +6,22 @@ import jobs.generation.Utilities;
def project = GithubProject
def branch = GithubBranchName

['Windows_NT', 'Linux', 'OSX10.13'].each { os ->
['OSX10.13'].each { os ->
['Debug', 'Release'].each { config ->
[true, false].each { isPR ->
// Calculate job name
def jobName = os.toLowerCase() + '_' + config.toLowerCase()
def buildFile = '';

def machineAffinity = 'latest-or-auto'

// Calculate the build command
if (os == 'Windows_NT') {
buildFile = ".\\build.cmd"
} else {
buildFile = "./build.sh"
}

def buildCommand = buildFile + " -$config -runtests"
def packCommand = buildFile + " -buildPackages"

def newJob = job(Utilities.getFullJobName(project, jobName, isPR)) {
steps {
if (os == 'Windows_NT') {
batchFile(buildCommand)
batchFile(packCommand)
}
else {
// Shell
shell(buildCommand)
shell(packCommand)
}
shell("./build.sh -$config -runtests")
shell("./build.sh -buildPackages")
}
}

def osImageName = os
if (os == 'Linux') {
// Trigger a portable Linux build that runs on RHEL7.2
osImageName = "RHEL7.2"
}

Utilities.setMachineAffinity(newJob, osImageName, machineAffinity)
Utilities.setMachineAffinity(newJob, os, machineAffinity)
Utilities.standardJobSetup(newJob, project, isPR, "*/${branch}")

if (isPR) {
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
21 changes: 21 additions & 0 deletions .vsts-dotnet-ci.yml
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
resources:

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we move this file from the root of the repo and instead put it in the build folder?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I left it in the root because if it is in the root we get Resource Authorization automatically:
https://github.com/Microsoft/vsts-agent/blob/master/docs/preview/yamlgettingstarted-authz.md

They do have plans on supporting directory structure for this though:
microsoft/azure-pipelines-agent#1430

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That is unfortunate.

containers:
- container: centos7
image: microsoft/dotnet-buildtools-prereqs:centos-7-b46d863-20180719033416

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

dotnet-buildtools-prereqs:centos-7-b46d863-20180719033416 [](start = 21, length = 57)

does this docker image contains libgdiplus?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@safernsafernJul 23, 2018

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I’m trying to build and run the tests locally in my computer with the same container. I’ll update you. Using your branch of course

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The tests that you added passed in my machine when using that docker image. I just need to dig why they are failing in VSTS, maybe not picking the right docker image. I'll update you.


phases:
- template: /build/ci/phase-template.yml
parameters:
name: Linux
buildScript: ./build.sh
queue:
container: centos7

- template: /build/ci/phase-template.yml
parameters:
name: Windows_NT

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Windows_NT [](start = 10, length = 10)

I obviously don't have knowleage regarding build system, but from what I see we have 4 nodes in VSTS where Windows_NT is not running, and also Windows builds on jenkins.
Is it intended?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So the jenkins Windows builds will stop showing up after I merge this PR. They keep showing because it takes the checked-in netci.groovy file instead of taking the one in this PR.

About the VSTS nodes, you can see here: https://dotnet.visualstudio.com/public/_build/results?buildId=7047&view=logs that the new Build Def, will run Linux and Windows in both Release and Debug mode simultaneously.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Got it, thank you for clarification.

buildScript: build.cmd
queue:
name: Hosted VS2017
demands:
- agent.os -equals Windows_NT
4 changes: 2 additions & 2 deletions README.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,9 +44,9 @@ To build ML.NET from source please visit our [developers guide](docs/project-doc

| | x64 Debug | x64 Release |
|:---|----------------:|------------------:|
|**Linux**|[![x64-debug](https://ci2.dot.net/job/dotnet_machinelearning/job/master/job/linux_debug/badge/icon)](https://ci2.dot.net/job/dotnet_machinelearning/job/master/job/linux_debug/lastCompletedBuild)|[![x64-release](https://ci2.dot.net/job/dotnet_machinelearning/job/master/job/linux_release/badge/icon)](https://ci2.dot.net/job/dotnet_machinelearning/job/master/job/linux_release/lastCompletedBuild)|
|**Linux**|[![x64-debug](https://dotnet.visualstudio.com/public/_apis/build/status/104?branch=master)](https://dotnet.visualstudio.com/DotNet-Public/_build/latest?definitionId=104&branch=master)|[![x64-release](https://dotnet.visualstudio.com/public/_apis/build/status/104?branch=master)](https://dotnet.visualstudio.com/DotNet-Public/_build/latest?definitionId=104&branch=master)|
|**macOS**|[![x64-debug](https://ci2.dot.net/job/dotnet_machinelearning/job/master/job/osx10.13_debug/badge/icon)](https://ci2.dot.net/job/dotnet_machinelearning/job/master/job/osx10.13_debug/lastCompletedBuild)|[![x64-release](https://ci2.dot.net/job/dotnet_machinelearning/job/master/job/osx10.13_release/badge/icon)](https://ci2.dot.net/job/dotnet_machinelearning/job/master/job/osx10.13_release/lastCompletedBuild)|
|**Windows**|[![x64-debug](https://ci2.dot.net/job/dotnet_machinelearning/job/master/job/windows_nt_debug/badge/icon)](https://ci2.dot.net/job/dotnet_machinelearning/job/master/job/windows_nt_debug/lastCompletedBuild)|[![x64-release](https://ci2.dot.net/job/dotnet_machinelearning/job/master/job/windows_nt_release/badge/icon)](https://ci2.dot.net/job/dotnet_machinelearning/job/master/job/windows_nt_release/lastCompletedBuild)|
|**Windows**|[![x64-debug](https://dotnet.visualstudio.com/public/_apis/build/status/104?branch=master)](https://dotnet.visualstudio.com/DotNet-Public/_build/latest?definitionId=104&branch=master)|[![x64-release](https://dotnet.visualstudio.com/public/_apis/build/status/104?branch=master)](https://dotnet.visualstudio.com/DotNet-Public/_build/latest?definitionId=104&branch=master)|

## Contributing

Expand Down
33 changes: 33 additions & 0 deletions build/ci/phase-template.yml
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
parameters:
name: ''
buildScript: ''
queue: {}

phases:
- phase: ${{ parameters.name }}
variables:
_buildScript: ${{ parameters.buildScript }}
_phaseName: ${{ parameters.name }}
queue:
parallel: 2
matrix:
Build_Debug:
_configuration: Debug
Build_Release:
_configuration: Release
${{ insert }}: ${{ parameters.queue }}
steps:
- script: $(_buildScript) -$(_configuration) -runtests
displayName: Build and Test
- task: PublishTestResults@2
displayName: Publish Test Results
condition: succeededOrFailed()
inputs:
testRunner: 'vSTest'

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

vSTest [](start = 21, length = 6)

don't we use xUnit tests, or they interchangeable?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We use xunit as a framework, but we use VSTest as our test runner:
https://github.com/dotnet/machinelearning/blob/master/test/run-tests.proj#L10

searchFolder: '$(System.DefaultWorkingDirectory)/bin'
testResultsFiles: '**/*.trx'
testRunTitle: Machinelearning_Tests_$(_phaseName)_$(_configuration)_$(Build.BuildNumber)
configuration: $(_configuration)
mergeTestResults: true
- script: $(_buildScript) -buildPackages
displayName: Build Packages
32 changes: 4 additions & 28 deletions netci.groovy
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,46 +6,22 @@ import jobs.generation.Utilities;
def project = GithubProject
def branch = GithubBranchName

['Windows_NT', 'Linux', 'OSX10.13'].each { os ->
['OSX10.13'].each { os ->
['Debug', 'Release'].each { config ->
[true, false].each { isPR ->
// Calculate job name
def jobName = os.toLowerCase() + '_' + config.toLowerCase()
def buildFile = '';

def machineAffinity = 'latest-or-auto'

// Calculate the build command
if (os == 'Windows_NT') {
buildFile = ".\\build.cmd"
} else {
buildFile = "./build.sh"
}

def buildCommand = buildFile + " -$config -runtests"
def packCommand = buildFile + " -buildPackages"

def newJob = job(Utilities.getFullJobName(project, jobName, isPR)) {
steps {
if (os == 'Windows_NT') {
batchFile(buildCommand)
batchFile(packCommand)
}
else {
// Shell
shell(buildCommand)
shell(packCommand)
}
shell("./build.sh -$config -runtests")
shell("./build.sh -buildPackages")
}
}

def osImageName = os
if (os == 'Linux') {
// Trigger a portable Linux build that runs on RHEL7.2
osImageName = "RHEL7.2"
}

Utilities.setMachineAffinity(newJob, osImageName, machineAffinity)
Utilities.setMachineAffinity(newJob, os, machineAffinity)
Utilities.standardJobSetup(newJob, project, isPR, "*/${branch}")

if (isPR) {
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
21 changes: 21 additions & 0 deletions .vsts-dotnet-ci.yml
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
resources:

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we move this file from the root of the repo and instead put it in the build folder?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I left it in the root because if it is in the root we get Resource Authorization automatically:
https://github.com/Microsoft/vsts-agent/blob/master/docs/preview/yamlgettingstarted-authz.md

They do have plans on supporting directory structure for this though:
microsoft/azure-pipelines-agent#1430

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That is unfortunate.

containers:
- container: centos7
image: microsoft/dotnet-buildtools-prereqs:centos-7-b46d863-20180719033416

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

dotnet-buildtools-prereqs:centos-7-b46d863-20180719033416 [](start = 21, length = 57)

does this docker image contains libgdiplus?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@safernsafernJul 23, 2018

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I’m trying to build and run the tests locally in my computer with the same container. I’ll update you. Using your branch of course

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The tests that you added passed in my machine when using that docker image. I just need to dig why they are failing in VSTS, maybe not picking the right docker image. I'll update you.


phases:
- template: /build/ci/phase-template.yml
parameters:
name: Linux
buildScript: ./build.sh
queue:
container: centos7

- template: /build/ci/phase-template.yml
parameters:
name: Windows_NT

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Windows_NT [](start = 10, length = 10)

I obviously don't have knowleage regarding build system, but from what I see we have 4 nodes in VSTS where Windows_NT is not running, and also Windows builds on jenkins.
Is it intended?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So the jenkins Windows builds will stop showing up after I merge this PR. They keep showing because it takes the checked-in netci.groovy file instead of taking the one in this PR.

About the VSTS nodes, you can see here: https://dotnet.visualstudio.com/public/_build/results?buildId=7047&view=logs that the new Build Def, will run Linux and Windows in both Release and Debug mode simultaneously.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Got it, thank you for clarification.

buildScript: build.cmd
queue:
name: Hosted VS2017
demands:
- agent.os -equals Windows_NT
4 changes: 2 additions & 2 deletions README.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,9 +44,9 @@ To build ML.NET from source please visit our [developers guide](docs/project-doc

| | x64 Debug | x64 Release |
|:---|----------------:|------------------:|
|**Linux**|[![x64-debug](https://ci2.dot.net/job/dotnet_machinelearning/job/master/job/linux_debug/badge/icon)](https://ci2.dot.net/job/dotnet_machinelearning/job/master/job/linux_debug/lastCompletedBuild)|[![x64-release](https://ci2.dot.net/job/dotnet_machinelearning/job/master/job/linux_release/badge/icon)](https://ci2.dot.net/job/dotnet_machinelearning/job/master/job/linux_release/lastCompletedBuild)|
|**Linux**|[![x64-debug](https://dotnet.visualstudio.com/public/_apis/build/status/104?branch=master)](https://dotnet.visualstudio.com/DotNet-Public/_build/latest?definitionId=104&branch=master)|[![x64-release](https://dotnet.visualstudio.com/public/_apis/build/status/104?branch=master)](https://dotnet.visualstudio.com/DotNet-Public/_build/latest?definitionId=104&branch=master)|
|**macOS**|[![x64-debug](https://ci2.dot.net/job/dotnet_machinelearning/job/master/job/osx10.13_debug/badge/icon)](https://ci2.dot.net/job/dotnet_machinelearning/job/master/job/osx10.13_debug/lastCompletedBuild)|[![x64-release](https://ci2.dot.net/job/dotnet_machinelearning/job/master/job/osx10.13_release/badge/icon)](https://ci2.dot.net/job/dotnet_machinelearning/job/master/job/osx10.13_release/lastCompletedBuild)|
|**Windows**|[![x64-debug](https://ci2.dot.net/job/dotnet_machinelearning/job/master/job/windows_nt_debug/badge/icon)](https://ci2.dot.net/job/dotnet_machinelearning/job/master/job/windows_nt_debug/lastCompletedBuild)|[![x64-release](https://ci2.dot.net/job/dotnet_machinelearning/job/master/job/windows_nt_release/badge/icon)](https://ci2.dot.net/job/dotnet_machinelearning/job/master/job/windows_nt_release/lastCompletedBuild)|
|**Windows**|[![x64-debug](https://dotnet.visualstudio.com/public/_apis/build/status/104?branch=master)](https://dotnet.visualstudio.com/DotNet-Public/_build/latest?definitionId=104&branch=master)|[![x64-release](https://dotnet.visualstudio.com/public/_apis/build/status/104?branch=master)](https://dotnet.visualstudio.com/DotNet-Public/_build/latest?definitionId=104&branch=master)|

## Contributing

Expand Down
33 changes: 33 additions & 0 deletions build/ci/phase-template.yml
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
parameters:
name: ''
buildScript: ''
queue: {}

phases:
- phase: ${{ parameters.name }}
variables:
_buildScript: ${{ parameters.buildScript }}
_phaseName: ${{ parameters.name }}
queue:
parallel: 2
matrix:
Build_Debug:
_configuration: Debug
Build_Release:
_configuration: Release
${{ insert }}: ${{ parameters.queue }}
steps:
- script: $(_buildScript) -$(_configuration) -runtests
displayName: Build and Test
- task: PublishTestResults@2
displayName: Publish Test Results
condition: succeededOrFailed()
inputs:
testRunner: 'vSTest'

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

vSTest [](start = 21, length = 6)

don't we use xUnit tests, or they interchangeable?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We use xunit as a framework, but we use VSTest as our test runner:
https://github.com/dotnet/machinelearning/blob/master/test/run-tests.proj#L10

searchFolder: '$(System.DefaultWorkingDirectory)/bin'
testResultsFiles: '**/*.trx'
testRunTitle: Machinelearning_Tests_$(_phaseName)_$(_configuration)_$(Build.BuildNumber)
configuration: $(_configuration)
mergeTestResults: true
- script: $(_buildScript) -buildPackages
displayName: Build Packages
32 changes: 4 additions & 28 deletions netci.groovy
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,46 +6,22 @@ import jobs.generation.Utilities;
def project = GithubProject
def branch = GithubBranchName

['Windows_NT', 'Linux', 'OSX10.13'].each { os ->
['OSX10.13'].each { os ->
['Debug', 'Release'].each { config ->
[true, false].each { isPR ->
// Calculate job name
def jobName = os.toLowerCase() + '_' + config.toLowerCase()
def buildFile = '';

def machineAffinity = 'latest-or-auto'

// Calculate the build command
if (os == 'Windows_NT') {
buildFile = ".\\build.cmd"
} else {
buildFile = "./build.sh"
}

def buildCommand = buildFile + " -$config -runtests"
def packCommand = buildFile + " -buildPackages"

def newJob = job(Utilities.getFullJobName(project, jobName, isPR)) {
steps {
if (os == 'Windows_NT') {
batchFile(buildCommand)
batchFile(packCommand)
}
else {
// Shell
shell(buildCommand)
shell(packCommand)
}
shell("./build.sh -$config -runtests")
shell("./build.sh -buildPackages")
}
}

def osImageName = os
if (os == 'Linux') {
// Trigger a portable Linux build that runs on RHEL7.2
osImageName = "RHEL7.2"
}

Utilities.setMachineAffinity(newJob, osImageName, machineAffinity)
Utilities.setMachineAffinity(newJob, os, machineAffinity)
Utilities.standardJobSetup(newJob, project, isPR, "*/${branch}")

if (isPR) {
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
21 changes: 21 additions & 0 deletions .vsts-dotnet-ci.yml
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
resources:

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we move this file from the root of the repo and instead put it in the build folder?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I left it in the root because if it is in the root we get Resource Authorization automatically:
https://github.com/Microsoft/vsts-agent/blob/master/docs/preview/yamlgettingstarted-authz.md

They do have plans on supporting directory structure for this though:
microsoft/azure-pipelines-agent#1430

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That is unfortunate.

containers:
- container: centos7
image: microsoft/dotnet-buildtools-prereqs:centos-7-b46d863-20180719033416

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

dotnet-buildtools-prereqs:centos-7-b46d863-20180719033416 [](start = 21, length = 57)

does this docker image contains libgdiplus?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@safernsafernJul 23, 2018

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I’m trying to build and run the tests locally in my computer with the same container. I’ll update you. Using your branch of course

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The tests that you added passed in my machine when using that docker image. I just need to dig why they are failing in VSTS, maybe not picking the right docker image. I'll update you.


phases:
- template: /build/ci/phase-template.yml
parameters:
name: Linux
buildScript: ./build.sh
queue:
container: centos7

- template: /build/ci/phase-template.yml
parameters:
name: Windows_NT

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Windows_NT [](start = 10, length = 10)

I obviously don't have knowleage regarding build system, but from what I see we have 4 nodes in VSTS where Windows_NT is not running, and also Windows builds on jenkins.
Is it intended?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So the jenkins Windows builds will stop showing up after I merge this PR. They keep showing because it takes the checked-in netci.groovy file instead of taking the one in this PR.

About the VSTS nodes, you can see here: https://dotnet.visualstudio.com/public/_build/results?buildId=7047&view=logs that the new Build Def, will run Linux and Windows in both Release and Debug mode simultaneously.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Got it, thank you for clarification.

buildScript: build.cmd
queue:
name: Hosted VS2017
demands:
- agent.os -equals Windows_NT
4 changes: 2 additions & 2 deletions README.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,9 +44,9 @@ To build ML.NET from source please visit our [developers guide](docs/project-doc

| | x64 Debug | x64 Release |
|:---|----------------:|------------------:|
|**Linux**|[![x64-debug](https://ci2.dot.net/job/dotnet_machinelearning/job/master/job/linux_debug/badge/icon)](https://ci2.dot.net/job/dotnet_machinelearning/job/master/job/linux_debug/lastCompletedBuild)|[![x64-release](https://ci2.dot.net/job/dotnet_machinelearning/job/master/job/linux_release/badge/icon)](https://ci2.dot.net/job/dotnet_machinelearning/job/master/job/linux_release/lastCompletedBuild)|
|**Linux**|[![x64-debug](https://dotnet.visualstudio.com/public/_apis/build/status/104?branch=master)](https://dotnet.visualstudio.com/DotNet-Public/_build/latest?definitionId=104&branch=master)|[![x64-release](https://dotnet.visualstudio.com/public/_apis/build/status/104?branch=master)](https://dotnet.visualstudio.com/DotNet-Public/_build/latest?definitionId=104&branch=master)|
|**macOS**|[![x64-debug](https://ci2.dot.net/job/dotnet_machinelearning/job/master/job/osx10.13_debug/badge/icon)](https://ci2.dot.net/job/dotnet_machinelearning/job/master/job/osx10.13_debug/lastCompletedBuild)|[![x64-release](https://ci2.dot.net/job/dotnet_machinelearning/job/master/job/osx10.13_release/badge/icon)](https://ci2.dot.net/job/dotnet_machinelearning/job/master/job/osx10.13_release/lastCompletedBuild)|
|**Windows**|[![x64-debug](https://ci2.dot.net/job/dotnet_machinelearning/job/master/job/windows_nt_debug/badge/icon)](https://ci2.dot.net/job/dotnet_machinelearning/job/master/job/windows_nt_debug/lastCompletedBuild)|[![x64-release](https://ci2.dot.net/job/dotnet_machinelearning/job/master/job/windows_nt_release/badge/icon)](https://ci2.dot.net/job/dotnet_machinelearning/job/master/job/windows_nt_release/lastCompletedBuild)|
|**Windows**|[![x64-debug](https://dotnet.visualstudio.com/public/_apis/build/status/104?branch=master)](https://dotnet.visualstudio.com/DotNet-Public/_build/latest?definitionId=104&branch=master)|[![x64-release](https://dotnet.visualstudio.com/public/_apis/build/status/104?branch=master)](https://dotnet.visualstudio.com/DotNet-Public/_build/latest?definitionId=104&branch=master)|

## Contributing

Expand Down
33 changes: 33 additions & 0 deletions build/ci/phase-template.yml
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
parameters:
name: ''
buildScript: ''
queue: {}

phases:
- phase: ${{ parameters.name }}
variables:
_buildScript: ${{ parameters.buildScript }}
_phaseName: ${{ parameters.name }}
queue:
parallel: 2
matrix:
Build_Debug:
_configuration: Debug
Build_Release:
_configuration: Release
${{ insert }}: ${{ parameters.queue }}
steps:
- script: $(_buildScript) -$(_configuration) -runtests
displayName: Build and Test
- task: PublishTestResults@2
displayName: Publish Test Results
condition: succeededOrFailed()
inputs:
testRunner: 'vSTest'

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

vSTest [](start = 21, length = 6)

don't we use xUnit tests, or they interchangeable?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We use xunit as a framework, but we use VSTest as our test runner:
https://github.com/dotnet/machinelearning/blob/master/test/run-tests.proj#L10

searchFolder: '$(System.DefaultWorkingDirectory)/bin'
testResultsFiles: '**/*.trx'
testRunTitle: Machinelearning_Tests_$(_phaseName)_$(_configuration)_$(Build.BuildNumber)
configuration: $(_configuration)
mergeTestResults: true
- script: $(_buildScript) -buildPackages
displayName: Build Packages
32 changes: 4 additions & 28 deletions netci.groovy
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,46 +6,22 @@ import jobs.generation.Utilities;
def project = GithubProject
def branch = GithubBranchName

['Windows_NT', 'Linux', 'OSX10.13'].each { os ->
['OSX10.13'].each { os ->
['Debug', 'Release'].each { config ->
[true, false].each { isPR ->
// Calculate job name
def jobName = os.toLowerCase() + '_' + config.toLowerCase()
def buildFile = '';

def machineAffinity = 'latest-or-auto'

// Calculate the build command
if (os == 'Windows_NT') {
buildFile = ".\\build.cmd"
} else {
buildFile = "./build.sh"
}

def buildCommand = buildFile + " -$config -runtests"
def packCommand = buildFile + " -buildPackages"

def newJob = job(Utilities.getFullJobName(project, jobName, isPR)) {
steps {
if (os == 'Windows_NT') {
batchFile(buildCommand)
batchFile(packCommand)
}
else {
// Shell
shell(buildCommand)
shell(packCommand)
}
shell("./build.sh -$config -runtests")
shell("./build.sh -buildPackages")
}
}

def osImageName = os
if (os == 'Linux') {
// Trigger a portable Linux build that runs on RHEL7.2
osImageName = "RHEL7.2"
}

Utilities.setMachineAffinity(newJob, osImageName, machineAffinity)
Utilities.setMachineAffinity(newJob, os, machineAffinity)
Utilities.standardJobSetup(newJob, project, isPR, "*/${branch}")

if (isPR) {
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
21 changes: 21 additions & 0 deletions .vsts-dotnet-ci.yml
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
resources:

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we move this file from the root of the repo and instead put it in the build folder?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I left it in the root because if it is in the root we get Resource Authorization automatically:
https://github.com/Microsoft/vsts-agent/blob/master/docs/preview/yamlgettingstarted-authz.md

They do have plans on supporting directory structure for this though:
microsoft/azure-pipelines-agent#1430

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That is unfortunate.

containers:
- container: centos7
image: microsoft/dotnet-buildtools-prereqs:centos-7-b46d863-20180719033416

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

dotnet-buildtools-prereqs:centos-7-b46d863-20180719033416 [](start = 21, length = 57)

does this docker image contains libgdiplus?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@safernsafernJul 23, 2018

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I’m trying to build and run the tests locally in my computer with the same container. I’ll update you. Using your branch of course

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The tests that you added passed in my machine when using that docker image. I just need to dig why they are failing in VSTS, maybe not picking the right docker image. I'll update you.


phases:
- template: /build/ci/phase-template.yml
parameters:
name: Linux
buildScript: ./build.sh
queue:
container: centos7

- template: /build/ci/phase-template.yml
parameters:
name: Windows_NT

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Windows_NT [](start = 10, length = 10)

I obviously don't have knowleage regarding build system, but from what I see we have 4 nodes in VSTS where Windows_NT is not running, and also Windows builds on jenkins.
Is it intended?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So the jenkins Windows builds will stop showing up after I merge this PR. They keep showing because it takes the checked-in netci.groovy file instead of taking the one in this PR.

About the VSTS nodes, you can see here: https://dotnet.visualstudio.com/public/_build/results?buildId=7047&view=logs that the new Build Def, will run Linux and Windows in both Release and Debug mode simultaneously.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Got it, thank you for clarification.

buildScript: build.cmd
queue:
name: Hosted VS2017
demands:
- agent.os -equals Windows_NT
4 changes: 2 additions & 2 deletions README.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,9 +44,9 @@ To build ML.NET from source please visit our [developers guide](docs/project-doc

| | x64 Debug | x64 Release |
|:---|----------------:|------------------:|
|**Linux**|[![x64-debug](https://ci2.dot.net/job/dotnet_machinelearning/job/master/job/linux_debug/badge/icon)](https://ci2.dot.net/job/dotnet_machinelearning/job/master/job/linux_debug/lastCompletedBuild)|[![x64-release](https://ci2.dot.net/job/dotnet_machinelearning/job/master/job/linux_release/badge/icon)](https://ci2.dot.net/job/dotnet_machinelearning/job/master/job/linux_release/lastCompletedBuild)|
|**Linux**|[![x64-debug](https://dotnet.visualstudio.com/public/_apis/build/status/104?branch=master)](https://dotnet.visualstudio.com/DotNet-Public/_build/latest?definitionId=104&branch=master)|[![x64-release](https://dotnet.visualstudio.com/public/_apis/build/status/104?branch=master)](https://dotnet.visualstudio.com/DotNet-Public/_build/latest?definitionId=104&branch=master)|
|**macOS**|[![x64-debug](https://ci2.dot.net/job/dotnet_machinelearning/job/master/job/osx10.13_debug/badge/icon)](https://ci2.dot.net/job/dotnet_machinelearning/job/master/job/osx10.13_debug/lastCompletedBuild)|[![x64-release](https://ci2.dot.net/job/dotnet_machinelearning/job/master/job/osx10.13_release/badge/icon)](https://ci2.dot.net/job/dotnet_machinelearning/job/master/job/osx10.13_release/lastCompletedBuild)|
|**Windows**|[![x64-debug](https://ci2.dot.net/job/dotnet_machinelearning/job/master/job/windows_nt_debug/badge/icon)](https://ci2.dot.net/job/dotnet_machinelearning/job/master/job/windows_nt_debug/lastCompletedBuild)|[![x64-release](https://ci2.dot.net/job/dotnet_machinelearning/job/master/job/windows_nt_release/badge/icon)](https://ci2.dot.net/job/dotnet_machinelearning/job/master/job/windows_nt_release/lastCompletedBuild)|
|**Windows**|[![x64-debug](https://dotnet.visualstudio.com/public/_apis/build/status/104?branch=master)](https://dotnet.visualstudio.com/DotNet-Public/_build/latest?definitionId=104&branch=master)|[![x64-release](https://dotnet.visualstudio.com/public/_apis/build/status/104?branch=master)](https://dotnet.visualstudio.com/DotNet-Public/_build/latest?definitionId=104&branch=master)|

## Contributing

Expand Down
33 changes: 33 additions & 0 deletions build/ci/phase-template.yml
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
parameters:
name: ''
buildScript: ''
queue: {}

phases:
- phase: ${{ parameters.name }}
variables:
_buildScript: ${{ parameters.buildScript }}
_phaseName: ${{ parameters.name }}
queue:
parallel: 2
matrix:
Build_Debug:
_configuration: Debug
Build_Release:
_configuration: Release
${{ insert }}: ${{ parameters.queue }}
steps:
- script: $(_buildScript) -$(_configuration) -runtests
displayName: Build and Test
- task: PublishTestResults@2
displayName: Publish Test Results
condition: succeededOrFailed()
inputs:
testRunner: 'vSTest'

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

vSTest [](start = 21, length = 6)

don't we use xUnit tests, or they interchangeable?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We use xunit as a framework, but we use VSTest as our test runner:
https://github.com/dotnet/machinelearning/blob/master/test/run-tests.proj#L10

searchFolder: '$(System.DefaultWorkingDirectory)/bin'
testResultsFiles: '**/*.trx'
testRunTitle: Machinelearning_Tests_$(_phaseName)_$(_configuration)_$(Build.BuildNumber)
configuration: $(_configuration)
mergeTestResults: true
- script: $(_buildScript) -buildPackages
displayName: Build Packages
32 changes: 4 additions & 28 deletions netci.groovy
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,46 +6,22 @@ import jobs.generation.Utilities;
def project = GithubProject
def branch = GithubBranchName

['Windows_NT', 'Linux', 'OSX10.13'].each { os ->
['OSX10.13'].each { os ->
['Debug', 'Release'].each { config ->
[true, false].each { isPR ->
// Calculate job name
def jobName = os.toLowerCase() + '_' + config.toLowerCase()
def buildFile = '';

def machineAffinity = 'latest-or-auto'

// Calculate the build command
if (os == 'Windows_NT') {
buildFile = ".\\build.cmd"
} else {
buildFile = "./build.sh"
}

def buildCommand = buildFile + " -$config -runtests"
def packCommand = buildFile + " -buildPackages"

def newJob = job(Utilities.getFullJobName(project, jobName, isPR)) {
steps {
if (os == 'Windows_NT') {
batchFile(buildCommand)
batchFile(packCommand)
}
else {
// Shell
shell(buildCommand)
shell(packCommand)
}
shell("./build.sh -$config -runtests")
shell("./build.sh -buildPackages")
}
}

def osImageName = os
if (os == 'Linux') {
// Trigger a portable Linux build that runs on RHEL7.2
osImageName = "RHEL7.2"
}

Utilities.setMachineAffinity(newJob, osImageName, machineAffinity)
Utilities.setMachineAffinity(newJob, os, machineAffinity)
Utilities.standardJobSetup(newJob, project, isPR, "*/${branch}")

if (isPR) {
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
21 changes: 21 additions & 0 deletions .vsts-dotnet-ci.yml
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
resources:

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we move this file from the root of the repo and instead put it in the build folder?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I left it in the root because if it is in the root we get Resource Authorization automatically:
https://github.com/Microsoft/vsts-agent/blob/master/docs/preview/yamlgettingstarted-authz.md

They do have plans on supporting directory structure for this though:
microsoft/azure-pipelines-agent#1430

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That is unfortunate.

containers:
- container: centos7
image: microsoft/dotnet-buildtools-prereqs:centos-7-b46d863-20180719033416

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

dotnet-buildtools-prereqs:centos-7-b46d863-20180719033416 [](start = 21, length = 57)

does this docker image contains libgdiplus?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@safernsafernJul 23, 2018

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I’m trying to build and run the tests locally in my computer with the same container. I’ll update you. Using your branch of course

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The tests that you added passed in my machine when using that docker image. I just need to dig why they are failing in VSTS, maybe not picking the right docker image. I'll update you.


phases:
- template: /build/ci/phase-template.yml
parameters:
name: Linux
buildScript: ./build.sh
queue:
container: centos7

- template: /build/ci/phase-template.yml
parameters:
name: Windows_NT

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Windows_NT [](start = 10, length = 10)

I obviously don't have knowleage regarding build system, but from what I see we have 4 nodes in VSTS where Windows_NT is not running, and also Windows builds on jenkins.
Is it intended?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So the jenkins Windows builds will stop showing up after I merge this PR. They keep showing because it takes the checked-in netci.groovy file instead of taking the one in this PR.

About the VSTS nodes, you can see here: https://dotnet.visualstudio.com/public/_build/results?buildId=7047&view=logs that the new Build Def, will run Linux and Windows in both Release and Debug mode simultaneously.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Got it, thank you for clarification.

buildScript: build.cmd
queue:
name: Hosted VS2017
demands:
- agent.os -equals Windows_NT
4 changes: 2 additions & 2 deletions README.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,9 +44,9 @@ To build ML.NET from source please visit our [developers guide](docs/project-doc

| | x64 Debug | x64 Release |
|:---|----------------:|------------------:|
|**Linux**|[![x64-debug](https://ci2.dot.net/job/dotnet_machinelearning/job/master/job/linux_debug/badge/icon)](https://ci2.dot.net/job/dotnet_machinelearning/job/master/job/linux_debug/lastCompletedBuild)|[![x64-release](https://ci2.dot.net/job/dotnet_machinelearning/job/master/job/linux_release/badge/icon)](https://ci2.dot.net/job/dotnet_machinelearning/job/master/job/linux_release/lastCompletedBuild)|
|**Linux**|[![x64-debug](https://dotnet.visualstudio.com/public/_apis/build/status/104?branch=master)](https://dotnet.visualstudio.com/DotNet-Public/_build/latest?definitionId=104&branch=master)|[![x64-release](https://dotnet.visualstudio.com/public/_apis/build/status/104?branch=master)](https://dotnet.visualstudio.com/DotNet-Public/_build/latest?definitionId=104&branch=master)|
|**macOS**|[![x64-debug](https://ci2.dot.net/job/dotnet_machinelearning/job/master/job/osx10.13_debug/badge/icon)](https://ci2.dot.net/job/dotnet_machinelearning/job/master/job/osx10.13_debug/lastCompletedBuild)|[![x64-release](https://ci2.dot.net/job/dotnet_machinelearning/job/master/job/osx10.13_release/badge/icon)](https://ci2.dot.net/job/dotnet_machinelearning/job/master/job/osx10.13_release/lastCompletedBuild)|
|**Windows**|[![x64-debug](https://ci2.dot.net/job/dotnet_machinelearning/job/master/job/windows_nt_debug/badge/icon)](https://ci2.dot.net/job/dotnet_machinelearning/job/master/job/windows_nt_debug/lastCompletedBuild)|[![x64-release](https://ci2.dot.net/job/dotnet_machinelearning/job/master/job/windows_nt_release/badge/icon)](https://ci2.dot.net/job/dotnet_machinelearning/job/master/job/windows_nt_release/lastCompletedBuild)|
|**Windows**|[![x64-debug](https://dotnet.visualstudio.com/public/_apis/build/status/104?branch=master)](https://dotnet.visualstudio.com/DotNet-Public/_build/latest?definitionId=104&branch=master)|[![x64-release](https://dotnet.visualstudio.com/public/_apis/build/status/104?branch=master)](https://dotnet.visualstudio.com/DotNet-Public/_build/latest?definitionId=104&branch=master)|

## Contributing

Expand Down
33 changes: 33 additions & 0 deletions build/ci/phase-template.yml
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
parameters:
name: ''
buildScript: ''
queue: {}

phases:
- phase: ${{ parameters.name }}
variables:
_buildScript: ${{ parameters.buildScript }}
_phaseName: ${{ parameters.name }}
queue:
parallel: 2
matrix:
Build_Debug:
_configuration: Debug
Build_Release:
_configuration: Release
${{ insert }}: ${{ parameters.queue }}
steps:
- script: $(_buildScript) -$(_configuration) -runtests
displayName: Build and Test
- task: PublishTestResults@2
displayName: Publish Test Results
condition: succeededOrFailed()
inputs:
testRunner: 'vSTest'

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

vSTest [](start = 21, length = 6)

don't we use xUnit tests, or they interchangeable?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We use xunit as a framework, but we use VSTest as our test runner:
https://github.com/dotnet/machinelearning/blob/master/test/run-tests.proj#L10

searchFolder: '$(System.DefaultWorkingDirectory)/bin'
testResultsFiles: '**/*.trx'
testRunTitle: Machinelearning_Tests_$(_phaseName)_$(_configuration)_$(Build.BuildNumber)
configuration: $(_configuration)
mergeTestResults: true
- script: $(_buildScript) -buildPackages
displayName: Build Packages
32 changes: 4 additions & 28 deletions netci.groovy
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,46 +6,22 @@ import jobs.generation.Utilities;
def project = GithubProject
def branch = GithubBranchName

['Windows_NT', 'Linux', 'OSX10.13'].each { os ->
['OSX10.13'].each { os ->
['Debug', 'Release'].each { config ->
[true, false].each { isPR ->
// Calculate job name
def jobName = os.toLowerCase() + '_' + config.toLowerCase()
def buildFile = '';

def machineAffinity = 'latest-or-auto'

// Calculate the build command
if (os == 'Windows_NT') {
buildFile = ".\\build.cmd"
} else {
buildFile = "./build.sh"
}

def buildCommand = buildFile + " -$config -runtests"
def packCommand = buildFile + " -buildPackages"

def newJob = job(Utilities.getFullJobName(project, jobName, isPR)) {
steps {
if (os == 'Windows_NT') {
batchFile(buildCommand)
batchFile(packCommand)
}
else {
// Shell
shell(buildCommand)
shell(packCommand)
}
shell("./build.sh -$config -runtests")
shell("./build.sh -buildPackages")
}
}

def osImageName = os
if (os == 'Linux') {
// Trigger a portable Linux build that runs on RHEL7.2
osImageName = "RHEL7.2"
}

Utilities.setMachineAffinity(newJob, osImageName, machineAffinity)
Utilities.setMachineAffinity(newJob, os, machineAffinity)
Utilities.standardJobSetup(newJob, project, isPR, "*/${branch}")

if (isPR) {
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
21 changes: 21 additions & 0 deletions .vsts-dotnet-ci.yml
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
resources:

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we move this file from the root of the repo and instead put it in the build folder?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I left it in the root because if it is in the root we get Resource Authorization automatically:
https://github.com/Microsoft/vsts-agent/blob/master/docs/preview/yamlgettingstarted-authz.md

They do have plans on supporting directory structure for this though:
microsoft/azure-pipelines-agent#1430

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That is unfortunate.

containers:
- container: centos7
image: microsoft/dotnet-buildtools-prereqs:centos-7-b46d863-20180719033416

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

dotnet-buildtools-prereqs:centos-7-b46d863-20180719033416 [](start = 21, length = 57)

does this docker image contains libgdiplus?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@safernsafernJul 23, 2018

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I’m trying to build and run the tests locally in my computer with the same container. I’ll update you. Using your branch of course

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The tests that you added passed in my machine when using that docker image. I just need to dig why they are failing in VSTS, maybe not picking the right docker image. I'll update you.


phases:
- template: /build/ci/phase-template.yml
parameters:
name: Linux
buildScript: ./build.sh
queue:
container: centos7

- template: /build/ci/phase-template.yml
parameters:
name: Windows_NT

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Windows_NT [](start = 10, length = 10)

I obviously don't have knowleage regarding build system, but from what I see we have 4 nodes in VSTS where Windows_NT is not running, and also Windows builds on jenkins.
Is it intended?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So the jenkins Windows builds will stop showing up after I merge this PR. They keep showing because it takes the checked-in netci.groovy file instead of taking the one in this PR.

About the VSTS nodes, you can see here: https://dotnet.visualstudio.com/public/_build/results?buildId=7047&view=logs that the new Build Def, will run Linux and Windows in both Release and Debug mode simultaneously.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Got it, thank you for clarification.

buildScript: build.cmd
queue:
name: Hosted VS2017
demands:
- agent.os -equals Windows_NT
4 changes: 2 additions & 2 deletions README.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,9 +44,9 @@ To build ML.NET from source please visit our [developers guide](docs/project-doc

| | x64 Debug | x64 Release |
|:---|----------------:|------------------:|
|**Linux**|[![x64-debug](https://ci2.dot.net/job/dotnet_machinelearning/job/master/job/linux_debug/badge/icon)](https://ci2.dot.net/job/dotnet_machinelearning/job/master/job/linux_debug/lastCompletedBuild)|[![x64-release](https://ci2.dot.net/job/dotnet_machinelearning/job/master/job/linux_release/badge/icon)](https://ci2.dot.net/job/dotnet_machinelearning/job/master/job/linux_release/lastCompletedBuild)|
|**Linux**|[![x64-debug](https://dotnet.visualstudio.com/public/_apis/build/status/104?branch=master)](https://dotnet.visualstudio.com/DotNet-Public/_build/latest?definitionId=104&branch=master)|[![x64-release](https://dotnet.visualstudio.com/public/_apis/build/status/104?branch=master)](https://dotnet.visualstudio.com/DotNet-Public/_build/latest?definitionId=104&branch=master)|
|**macOS**|[![x64-debug](https://ci2.dot.net/job/dotnet_machinelearning/job/master/job/osx10.13_debug/badge/icon)](https://ci2.dot.net/job/dotnet_machinelearning/job/master/job/osx10.13_debug/lastCompletedBuild)|[![x64-release](https://ci2.dot.net/job/dotnet_machinelearning/job/master/job/osx10.13_release/badge/icon)](https://ci2.dot.net/job/dotnet_machinelearning/job/master/job/osx10.13_release/lastCompletedBuild)|
|**Windows**|[![x64-debug](https://ci2.dot.net/job/dotnet_machinelearning/job/master/job/windows_nt_debug/badge/icon)](https://ci2.dot.net/job/dotnet_machinelearning/job/master/job/windows_nt_debug/lastCompletedBuild)|[![x64-release](https://ci2.dot.net/job/dotnet_machinelearning/job/master/job/windows_nt_release/badge/icon)](https://ci2.dot.net/job/dotnet_machinelearning/job/master/job/windows_nt_release/lastCompletedBuild)|
|**Windows**|[![x64-debug](https://dotnet.visualstudio.com/public/_apis/build/status/104?branch=master)](https://dotnet.visualstudio.com/DotNet-Public/_build/latest?definitionId=104&branch=master)|[![x64-release](https://dotnet.visualstudio.com/public/_apis/build/status/104?branch=master)](https://dotnet.visualstudio.com/DotNet-Public/_build/latest?definitionId=104&branch=master)|

## Contributing

Expand Down
33 changes: 33 additions & 0 deletions build/ci/phase-template.yml
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
parameters:
name: ''
buildScript: ''
queue: {}

phases:
- phase: ${{ parameters.name }}
variables:
_buildScript: ${{ parameters.buildScript }}
_phaseName: ${{ parameters.name }}
queue:
parallel: 2
matrix:
Build_Debug:
_configuration: Debug
Build_Release:
_configuration: Release
${{ insert }}: ${{ parameters.queue }}
steps:
- script: $(_buildScript) -$(_configuration) -runtests
displayName: Build and Test
- task: PublishTestResults@2
displayName: Publish Test Results
condition: succeededOrFailed()
inputs:
testRunner: 'vSTest'

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

vSTest [](start = 21, length = 6)

don't we use xUnit tests, or they interchangeable?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We use xunit as a framework, but we use VSTest as our test runner:
https://github.com/dotnet/machinelearning/blob/master/test/run-tests.proj#L10

searchFolder: '$(System.DefaultWorkingDirectory)/bin'
testResultsFiles: '**/*.trx'
testRunTitle: Machinelearning_Tests_$(_phaseName)_$(_configuration)_$(Build.BuildNumber)
configuration: $(_configuration)
mergeTestResults: true
- script: $(_buildScript) -buildPackages
displayName: Build Packages
32 changes: 4 additions & 28 deletions netci.groovy
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,46 +6,22 @@ import jobs.generation.Utilities;
def project = GithubProject
def branch = GithubBranchName

['Windows_NT', 'Linux', 'OSX10.13'].each { os ->
['OSX10.13'].each { os ->
['Debug', 'Release'].each { config ->
[true, false].each { isPR ->
// Calculate job name
def jobName = os.toLowerCase() + '_' + config.toLowerCase()
def buildFile = '';

def machineAffinity = 'latest-or-auto'

// Calculate the build command
if (os == 'Windows_NT') {
buildFile = ".\\build.cmd"
} else {
buildFile = "./build.sh"
}

def buildCommand = buildFile + " -$config -runtests"
def packCommand = buildFile + " -buildPackages"

def newJob = job(Utilities.getFullJobName(project, jobName, isPR)) {
steps {
if (os == 'Windows_NT') {
batchFile(buildCommand)
batchFile(packCommand)
}
else {
// Shell
shell(buildCommand)
shell(packCommand)
}
shell("./build.sh -$config -runtests")
shell("./build.sh -buildPackages")
}
}

def osImageName = os
if (os == 'Linux') {
// Trigger a portable Linux build that runs on RHEL7.2
osImageName = "RHEL7.2"
}

Utilities.setMachineAffinity(newJob, osImageName, machineAffinity)
Utilities.setMachineAffinity(newJob, os, machineAffinity)
Utilities.standardJobSetup(newJob, project, isPR, "*/${branch}")

if (isPR) {
Expand Down