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
2 changes: 2 additions & 0 deletions fcs/build.cmd
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
@echo off

dotnet --version
.nuget\NuGet.exe restore -PackagesDirectory packages
setlocal
cd fcs
Expand Down
2 changes: 2 additions & 0 deletions fcs/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ then
# use .Net
cmd fcs/build.cmd $@
else
dotnet --version

mono .nuget/NuGet.exe restore -PackagesDirectory packages

cd fcs
Expand Down
20 changes: 10 additions & 10 deletions netci.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,14 @@ def static getBuildJobName(def configuration, def os) {

[true, false].each { isPullRequest ->
osList.each { os ->
def configurations = ['Debug', 'Release_ci_part1', 'Release_ci_part2', 'Release_ci_part3', 'Release_net40_no_vs', 'Release_fcs' ];
if (os != 'Windows_NT') {
// Only build one configuration on Linux/... so far
configurations = ['Release'];
def configurations = [];
if (os == 'Windows_NT') {
}
configurations = ['Debug', 'Release_ci_part1', 'Release_ci_part2', 'Release_ci_part3', 'Release_net40_no_vs', 'Release_fcs' ];
else
{
// Linux
configurations = ['Release', 'Release_fcs' ];
}
configurations.each { configuration ->

Expand All @@ -35,12 +39,8 @@ def static getBuildJobName(def configuration, def os) {
def buildFlavor= '';

if (configuration == "Release_fcs") {
if (os == 'Windows_NT') {
buildPath = ".\\fcs\\"
}
else {
buildPath = "./fcs/"
}
// Build FCS
buildPath = "./fcs/"
buildFlavor = ""
build_args = "TestAndNuget"
}
Expand Down