From 4f2e754648cd815f3694d46431d1b4f623fa1d76 Mon Sep 17 00:00:00 2001 From: jindraivanek Date: Sat, 16 Feb 2019 09:23:07 +0100 Subject: [PATCH 1/3] TestExternalProjects: add fulma-demo --- build.fsx | 13 ++++++++++--- src/Fantomas.Tests/Fantomas.Tests.fsproj | 2 +- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/build.fsx b/build.fsx index ce60fd13c2..898470d753 100644 --- a/build.fsx +++ b/build.fsx @@ -80,10 +80,12 @@ type ExternalProjectInfo = // For linux we run this by invoking sh explicitly and passing the build.sh script as an argument as some // projects generated on windows don't have the executable permission set for .sh scripts. On windows we // treat .cmd files as executable -let configureBuildCommandFromDefaultFakeBuildScripts pathToProject = +let configureBuildCommandFromFakeBuildScripts scriptPrefix argument pathToProject = if Environment.isWindows - then { ProcessName = Path.combine pathToProject "build.cmd"; Arguments = [ "Build" ] } - else { ProcessName = "sh"; Arguments = [ sprintf "%s/build.sh Build" pathToProject ] } + then { ProcessName = Path.combine pathToProject (sprintf "%s.cmd" scriptPrefix); Arguments = [ argument ] } + else { ProcessName = "sh"; Arguments = [ sprintf "%s/%s.sh %s" pathToProject scriptPrefix argument ] } +let configureBuildCommandFromDefaultFakeBuildScripts pathToProject = + configureBuildCommandFromFakeBuildScripts "build" "Build" pathToProject let configureBuildCommandDotnetBuild pathToProject = { ProcessName = "dotnet"; Arguments = [ "build"; pathToProject ] } @@ -106,6 +108,11 @@ let externalProjectsToTest = [ Tag = "5.1.0" SourceSubDirectory = "src" BuildConfigurationFn = configureBuildCommandFromDefaultFakeBuildScripts } + { GitUrl = @"https://github.com/MangelMaxime/fulma-demo" + DirectoryName = "fulma-demo" + Tag = "master" + SourceSubDirectory = "src" + BuildConfigurationFn = configureBuildCommandFromFakeBuildScripts "fake" "build" } ] let externalProjectsToTestFailing = [ diff --git a/src/Fantomas.Tests/Fantomas.Tests.fsproj b/src/Fantomas.Tests/Fantomas.Tests.fsproj index 8478aa3655..41d2fe8fdc 100644 --- a/src/Fantomas.Tests/Fantomas.Tests.fsproj +++ b/src/Fantomas.Tests/Fantomas.Tests.fsproj @@ -1,4 +1,4 @@ - + 2.9.1 From 7dc8eca6412f04985b08b1a8579269846082be9f Mon Sep 17 00:00:00 2001 From: jindraivanek Date: Wed, 15 May 2019 15:45:37 +0200 Subject: [PATCH 2/3] trigger fantomas-ui preview build on change of master branch --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index 9321f32bfa..4ddaf1b037 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,3 +16,7 @@ jobs: - stage: "TestExternalProjects" script: docker run -v "${PWD}:/var/fantomas" -w "/var/fantomas" dcurylo/fsharp-mono-netcore:2.1.503 bash -c "./build.sh -t TestExternalProjects" if: branch = test-external-projects + - stage: "trigger fantomas-ui pipeline" + script: + - curl -X POST -F token=$FANTOMAS_UI_TOKEN -F ref=preview -F "variables[TRIGGER]=true" https://gitlab.com/api/v4/projects/8920076/trigger/pipeline + if: branch = master \ No newline at end of file From 719f80e6ca124e1340bcd260d492e5948bce9aa5 Mon Sep 17 00:00:00 2001 From: jindraivanek Date: Wed, 12 Jun 2019 08:21:17 +0200 Subject: [PATCH 3/3] use Microsoft.NETFramework.ReferenceAssemblies package for reference paths on mono --- .paket/Paket.Restore.targets | 2 +- src/netfx.props | 31 ++++++------------------------- 2 files changed, 7 insertions(+), 26 deletions(-) diff --git a/.paket/Paket.Restore.targets b/.paket/Paket.Restore.targets index 0df24f949c..818b4eca9e 100644 --- a/.paket/Paket.Restore.targets +++ b/.paket/Paket.Restore.targets @@ -252,7 +252,7 @@ - <_NuspecFiles Include="$(AdjustedNuspecOutputPath)\*.nuspec"/> + <_NuspecFiles Include="$(AdjustedNuspecOutputPath)\*.$(PackageVersion).nuspec"/> diff --git a/src/netfx.props b/src/netfx.props index b35981f986..785fd158a4 100644 --- a/src/netfx.props +++ b/src/netfx.props @@ -1,26 +1,7 @@ - - - - - true - - - /Library/Frameworks/Mono.framework/Versions/Current/lib/mono - /usr/lib/mono - /usr/local/lib/mono - - - $(BaseFrameworkPathOverrideForMono)/4.5-api - $(BaseFrameworkPathOverrideForMono)/4.5.1-api - $(BaseFrameworkPathOverrideForMono)/4.5.2-api - $(BaseFrameworkPathOverrideForMono)/4.6-api - $(BaseFrameworkPathOverrideForMono)/4.6.1-api - $(BaseFrameworkPathOverrideForMono)/4.6.2-api - $(BaseFrameworkPathOverrideForMono)/4.7-api - $(BaseFrameworkPathOverrideForMono)/4.7.1-api - true - - - $(FrameworkPathOverride)/Facades;$(AssemblySearchPaths) - + + + + \ No newline at end of file