From 07026de7db0137399db9e069c251874ec7289939 Mon Sep 17 00:00:00 2001 From: Steffen Forkmann Date: Fri, 20 Oct 2017 07:57:12 +0200 Subject: [PATCH 1/4] Update netci.groovy --- netci.groovy | 1 + 1 file changed, 1 insertion(+) diff --git a/netci.groovy b/netci.groovy index 653514e3c0..b4e8f6fba1 100644 --- a/netci.groovy +++ b/netci.groovy @@ -35,6 +35,7 @@ def static getBuildJobName(def configuration, def os) { def buildFlavor= ''; if (configuration == "Release_fcs") { + // Build FCS if (os == 'Windows_NT') { buildPath = ".\\fcs\\" } From 0f37cfa6cbd36d29437ad2900d425ad6c94800e4 Mon Sep 17 00:00:00 2001 From: Steffen Forkmann Date: Fri, 20 Oct 2017 08:43:03 +0200 Subject: [PATCH 2/4] Run Release_fcs on ubuntu --- netci.groovy | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/netci.groovy b/netci.groovy index b4e8f6fba1..f2b41e6f9a 100644 --- a/netci.groovy +++ b/netci.groovy @@ -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 -> From e0fb43ab99918c118f0ad3dfe156cc27356d0aee Mon Sep 17 00:00:00 2001 From: Steffen Forkmann Date: Fri, 20 Oct 2017 08:49:56 +0200 Subject: [PATCH 3/4] show dotnet version --- fcs/build.cmd | 3 +++ fcs/build.sh | 2 ++ 2 files changed, 5 insertions(+) diff --git a/fcs/build.cmd b/fcs/build.cmd index 163dd45634..455c884dce 100644 --- a/fcs/build.cmd +++ b/fcs/build.cmd @@ -1,4 +1,7 @@ @echo off + +dotnet --version + .nuget\NuGet.exe restore -PackagesDirectory packages setlocal cd fcs diff --git a/fcs/build.sh b/fcs/build.sh index f0107dfdaf..d6559cfaa8 100644 --- a/fcs/build.sh +++ b/fcs/build.sh @@ -4,6 +4,8 @@ then # use .Net cmd fcs/build.cmd $@ else + dotnet --version + mono .nuget/NuGet.exe restore -PackagesDirectory packages cd fcs From 23ef708a9cb6d3b3837d7938867e43e45137e11b Mon Sep 17 00:00:00 2001 From: Steffen Forkmann Date: Fri, 20 Oct 2017 08:58:31 +0200 Subject: [PATCH 4/4] wrong path? --- fcs/build.cmd | 1 - netci.groovy | 7 +------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/fcs/build.cmd b/fcs/build.cmd index 455c884dce..f7242b0391 100644 --- a/fcs/build.cmd +++ b/fcs/build.cmd @@ -1,7 +1,6 @@ @echo off dotnet --version - .nuget\NuGet.exe restore -PackagesDirectory packages setlocal cd fcs diff --git a/netci.groovy b/netci.groovy index f2b41e6f9a..7eb435f059 100644 --- a/netci.groovy +++ b/netci.groovy @@ -40,12 +40,7 @@ def static getBuildJobName(def configuration, def os) { if (configuration == "Release_fcs") { // Build FCS - if (os == 'Windows_NT') { - buildPath = ".\\fcs\\" - } - else { - buildPath = "./fcs/" - } + buildPath = "./fcs/" buildFlavor = "" build_args = "TestAndNuget" }