From dba3e55c0a4aa7ca59bc10852b3c35a000b1c615 Mon Sep 17 00:00:00 2001 From: Victor Hurdugaci Date: Wed, 6 Jan 2016 16:02:05 -0800 Subject: [PATCH] Update the templates --- .../build/_k-standard-goals.shade | 3 --- build-template-dotnet/.travis.yml | 2 +- build-template-dotnet/appveyor.yml | 2 +- build-template-dotnet/build.cmd | 4 ++-- build-template/.gitattributes | 1 + build-template/.travis.yml | 20 +++++++++++++++++++ build-template/appveyor.yml | 7 +++++++ 7 files changed, 32 insertions(+), 7 deletions(-) create mode 100644 build-template/.travis.yml create mode 100644 build-template/appveyor.yml diff --git a/KoreBuild-dotnet/build/_k-standard-goals.shade b/KoreBuild-dotnet/build/_k-standard-goals.shade index 7a591d96cc..fa587d42bf 100644 --- a/KoreBuild-dotnet/build/_k-standard-goals.shade +++ b/KoreBuild-dotnet/build/_k-standard-goals.shade @@ -178,9 +178,6 @@ default NUGET_FEED = 'https://api.nuget.org/v3/index.json' #--quiet @{ AddToE("KOREBUILD_BOWER_INSTALL_OPTIONS", "--quiet"); - AddToE("KOREBUILD_DOTNET_BUILD_OPTIONS", "--quiet"); - AddToE("KOREBUILD_DOTNET_PACK_OPTIONS", "--quiet"); - AddToE("KOREBUILD_DOTNET_RESTORE_OPTIONS", "--quiet"); AddToE("KOREBUILD_NPM_INSTALL_OPTIONS", "--quiet"); Quiet = true; } diff --git a/build-template-dotnet/.travis.yml b/build-template-dotnet/.travis.yml index bf811dc26a..e8f77f0f14 100644 --- a/build-template-dotnet/.travis.yml +++ b/build-template-dotnet/.travis.yml @@ -17,4 +17,4 @@ os: - osx osx_image: xcode7.1 script: - - ./build.sh verify \ No newline at end of file + - ./build.sh --quiet verify \ No newline at end of file diff --git a/build-template-dotnet/appveyor.yml b/build-template-dotnet/appveyor.yml index 3fab83e134..636a7618d3 100644 --- a/build-template-dotnet/appveyor.yml +++ b/build-template-dotnet/appveyor.yml @@ -1,7 +1,7 @@ init: - git config --global core.autocrlf true build_script: - - build.cmd verify + - build.cmd --quiet verify clone_depth: 1 test: off deploy: off \ No newline at end of file diff --git a/build-template-dotnet/build.cmd b/build-template-dotnet/build.cmd index 7018549e83..65fb3e3353 100644 --- a/build-template-dotnet/build.cmd +++ b/build-template-dotnet/build.cmd @@ -2,7 +2,7 @@ SETLOCAL SET REPO_FOLDER=%~dp0 -CD %REPO_FOLDER% +CD "%REPO_FOLDER%" SET BUILD_FOLDER=.build SET KOREBUILD_FOLDER=%BUILD_FOLDER%\KoreBuild-dotnet @@ -34,7 +34,7 @@ IF NOT EXIST %KOREBUILD_FOLDER% ( SET KOREBUILD_DOWNLOAD_ARGS=-version %KOREBUILD_VERSION% ) - %NUGET_PATH% install KoreBuild-dotnet -ExcludeVersion -o %BUILD_FOLDER% -nocache -pre %KOREBUILD_DOWNLOAD_ARGS% + %BUILD_FOLDER%\nuget.exe install KoreBuild-dotnet -ExcludeVersion -o %BUILD_FOLDER% -nocache -pre %KOREBUILD_DOWNLOAD_ARGS% ) "%KOREBUILD_FOLDER%\build\KoreBuild.cmd" %* diff --git a/build-template/.gitattributes b/build-template/.gitattributes index bdaa5ba982..66abdf279e 100644 --- a/build-template/.gitattributes +++ b/build-template/.gitattributes @@ -48,3 +48,4 @@ *.fsproj text=auto *.dbproj text=auto *.sln text=auto eol=crlf +*.sh eol=lf \ No newline at end of file diff --git a/build-template/.travis.yml b/build-template/.travis.yml new file mode 100644 index 0000000000..bf811dc26a --- /dev/null +++ b/build-template/.travis.yml @@ -0,0 +1,20 @@ +language: csharp +sudo: required +dist: trusty +addons: + apt: + packages: + - gettext + - libcurl4-openssl-dev + - libicu-dev + - libssl-dev + - libunwind8 + - zlib1g +mono: + - 4.0.5 +os: + - linux + - osx +osx_image: xcode7.1 +script: + - ./build.sh verify \ No newline at end of file diff --git a/build-template/appveyor.yml b/build-template/appveyor.yml new file mode 100644 index 0000000000..3fab83e134 --- /dev/null +++ b/build-template/appveyor.yml @@ -0,0 +1,7 @@ +init: + - git config --global core.autocrlf true +build_script: + - build.cmd verify +clone_depth: 1 +test: off +deploy: off \ No newline at end of file