Skip to content

Commit 16dd6d1

Browse files
committed
Prepare for dogfood
1 parent e4aecff commit 16dd6d1

File tree

3 files changed

+9
-8
lines changed

3 files changed

+9
-8
lines changed

.travis.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,11 @@ language: csharp
22
solution: xake.sln
33
env: VER=$(if [[ "${TRAVIS_TAG:0:1}" == "v" ]]; then echo ${TRAVIS_TAG:1}; else echo 0.0.0; fi;)
44
install:
5-
- nuget restore xake.sln
6-
- nuget install NUnit.Runners -Version 2.6.4 -OutputDirectory testrunner
5+
- mono .paket/paket.bootstrapper.exe
6+
- mono .paket/paket.exe install
77
script:
88
- echo "module Xake.Const [<Literal>] let internal Version = \"$VER.$TRAVIS_BUILD_NUMBER\"" > ./core/VersionInfo.fs
9-
- xbuild /p:Configuration=Release xake.sln
10-
- mono ./testrunner/NUnit.Runners.2.6.4/tools/nunit-console.exe ./bin/XakeLibTests.dll
9+
- fsharpi build.fsx -- build test
1110
deploy:
1211
provider: releases
1312
api_key:

build.fsx

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ System.Environment.CurrentDirectory <- __SOURCE_DIRECTORY__
55
let file = System.IO.Path.Combine("packages", "Xake.Core.dll")
66
if not (System.IO.File.Exists file) then
77
printf "downloading xake.core assembly..."; System.IO.Directory.CreateDirectory("packages") |> ignore
8-
let url = "https://github.com/OlegZee/Xake/releases/download/v0.3.1/Xake.Core.dll"
8+
let url = "https://github.com/OlegZee/Xake/releases/download/v0.3.5/Xake.Core.dll"
99
use wc = new System.Net.WebClient() in wc.DownloadFile(url, file + "__"); System.IO.File.Move(file + "__", file)
1010
printfn ""
1111

@@ -19,11 +19,10 @@ let build target = action {
1919
do! alwaysRerun()
2020
do! MSBuild {MSBuildSettings with BuildFile = "xake.sln"; Property = [("Configuration", "Release")]; Target = [target]}
2121
}
22-
(*
22+
2323
let systemClr cmd args =
2424
let cmd',args' = if Xake.Env.isUnix then "mono", cmd::args else cmd,args
2525
in system cmd' args'
26-
*)
2726

2827
do xake {XakeOptions with FileLog = "build.log"; ConLogLevel = Verbosity.Chatty } {
2928

@@ -47,7 +46,7 @@ do xake {XakeOptions with FileLog = "build.log"; ConLogLevel = Verbosity.Chatty
4746

4847
"test" => action {
4948

50-
let! exit_code = system "packages/NUnit.Runners/tools/nunit-console.exe" ["./bin/XakeLibTests.dll"]
49+
let! exit_code = systemClr "packages/NUnit.Runners/tools/nunit-console.exe" ["./bin/XakeLibTests.dll"]
5150
if exit_code <> 0 then
5251
failwith "Failed to test"
5352
}

docs/implnotes.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,3 +113,6 @@ Command line arguments override the script options (XakeOptions type) unless you
113113
* csc task option "copy deps to output folder"
114114
* manually copy (need tracking which are really needed)
115115
* explicit external map of deps: use both
116+
117+
### Build notes
118+
* tagged commits starting with 'v' create a new release

0 commit comments

Comments
 (0)