Skip to content

Feature/travis ci #1149

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 12 commits into from
Dec 18, 2014
Merged

Feature/travis ci #1149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
ea5093a
fixed build on mono and fixed build.sh
Mpdreamz Dec 15, 2014
d740996
added travis.yml
Mpdreamz Dec 15, 2014
ca8cad6
added language key
Mpdreamz Dec 15, 2014
5207717
added missing csharp config key
Mpdreamz Dec 15, 2014
dac2f28
trailing enter
Mpdreamz Dec 15, 2014
a254d26
.travis.yml
Mpdreamz Dec 15, 2014
9854e1f
Fake.exe => FAKE.exe
Mpdreamz Dec 15, 2014
f86c6e5
propagate exit code
Mpdreamz Dec 15, 2014
7b6a884
NEST => Nest
Mpdreamz Dec 15, 2014
358396d
MONOEXIT =>
Mpdreamz Dec 15, 2014
2155793
ECHO => echo
Mpdreamz Dec 15, 2014
43d7314
Fixed casing issues that prevented the build on proper UNIX systems
Mpdreamz Dec 16, 2014
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
3 changes: 3 additions & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
language: csharp
solution: src/Elasticsearch.sln
script: ./build.sh
11 changes: 7 additions & 4 deletions build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
NUGET="build/tools/nuget/nuget.exe"
FAKE="build/tools/FAKE/tools/Fake.exe"
FAKE="build/tools/FAKE/tools/FAKE.exe"
NUNIT="build/tools/NUnit.Runners/tools/nunit-console.exe"
FSHARPCLI="build/tools/Fsharp.Formatting.CommandTool/Fsharp.Formatting.CommandTool.nupkg"
SOURCELINK="build/tools/SourceLink.Fake/SourceLink.Fake.nupkg"
Expand All @@ -8,7 +8,7 @@ SOURCELINK="build/tools/SourceLink.Fake/SourceLink.Fake.nupkg"
if [[ ! -f "$NUGET" ]]; then
echo NUGET not found.. Download...
mkdir -p build/tools/nuget
curl -o $NUGET http://build.nuget.org/drops/client/master/NuGet.exe
curl -o $NUGET https://nugetbuild.cloudapp.net/drops/client/master/NuGet.exe
fi

#we need FAKE to process our build scripts
Expand Down Expand Up @@ -40,6 +40,9 @@ libdir=$PWD/build/tools/FAKE/tools/
$FSHARPI --lib:$libdir $@
EOF
chmod +x fsharpi
mono --runtime=v4.0 "$FAKE" build/build.fsx $@
mono --runtime=v4.0 "$FAKE" build/build.fsx "skiptests=1" $@
MONOEXIT=$?
rm fsharpi
#"build\tools\FAKE\tools\Fake.exe" "build\build.fsx" "target=%TARGET%" "version=%VERSION%"
#FORCE exit code to be that of calling fake not the last rm action
exit $MONOEXIT
#"build\tools\FAKE\tools\Fake.exe" "build\build.fsx" "target=%TARGET%" "version=%VERSION%" "skiptests=1"
10 changes: 5 additions & 5 deletions build/build.fsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// include Fake lib
#r @"tools/FAKE/tools/FakeLib.dll"
#r @"FakeLib.dll"
#load @"InheritDoc.fsx"
open Fake
open System
Expand Down Expand Up @@ -31,7 +31,7 @@ Target "BuildApp" (fun _ ->
//Override the prebuild event because it just calls a fake task BuildApp depends on anyways
let msbuildProperties = [
("Configuration","Release");
("PreBuildEvent","ECHO");
("PreBuildEvent","echo");
]

//Compile each csproj and output it seperately in build/output/PROJECTNAME
Expand Down Expand Up @@ -73,7 +73,7 @@ Target "CreateKeysIfAbsent" (fun _ ->
)

let getFileVersion = fun _ ->
let assemblyFileContents = ReadFileAsString @"src\NEST\Properties\AssemblyInfo.cs"
let assemblyFileContents = ReadFileAsString @"src/Nest/Properties/AssemblyInfo.cs"
let re = @"\[assembly\: AssemblyFileVersionAttribute\(""([^""]+)""\)\]"
let matches = Regex.Matches(assemblyFileContents,re)
let defaultVersion = regex_replace re "$1" (matches.Item(0).Captures.Item(0).Value)
Expand Down Expand Up @@ -231,7 +231,7 @@ Target "Nightly" (fun _ ->
==> "CreateKeysIfAbsent"
=?> ("Version", hasBuildParam "version")
==> "BuildApp"
==> "Test"
=?> ("Test", (not (hasBuildParam "skiptests")))
==> "Build"

"CreateKeysIfAbsent"
Expand All @@ -248,4 +248,4 @@ Target "Nightly" (fun _ ->
"CreateKeysIfAbsent"
"Version"
// start build
RunTargetOrDefault "Build"
RunTargetOrDefault "Build"
1 change: 1 addition & 0 deletions dep/repositories.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<repository path="../src/Nest/packages.config" />
<repository path="../src/Profiling/Profiling.Indexing/packages.config" />
<repository path="../src/Profiling/Profiling.InMemoryConnection/packages.config" />
<repository path="../src/Serialization/Elasticsearch.Net.JsonNET/packages.config" />
<repository path="../src/Tests/Elasticsearch.Net.Integration.Yaml/packages.config" />
<repository path="../src/Tests/Elasticsearch.Net.Tests.Unit/packages.config" />
<repository path="../src/Tests/Nest.Tests.Integration/packages.config" />
Expand Down
Loading