Skip to content

Commit cc27128

Browse files
committed
ensure we run tests on ci
1 parent 7484ccf commit cc27128

File tree

5 files changed

+12
-4
lines changed

5 files changed

+12
-4
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
env:
3434
NUGET_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}}
3535

36-
- run: ./build.sh build -s true
36+
- run: ./build.sh test
3737
name: Build
3838
- run: ./build.sh generatepackages -s true
3939
name: Generate local nuget packages

build/scripts/CommandLine.fs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ open Microsoft.FSharp.Reflection
1010
type Arguments =
1111
| [<CliPrefix(CliPrefix.None);SubCommand>] Clean
1212
| [<CliPrefix(CliPrefix.None);SubCommand>] Build
13-
13+
| [<CliPrefix(CliPrefix.None);SubCommand>] Test
14+
1415
| [<CliPrefix(CliPrefix.None);Hidden;SubCommand>] PristineCheck
1516
| [<CliPrefix(CliPrefix.None);Hidden;SubCommand>] GeneratePackages
1617
| [<CliPrefix(CliPrefix.None);Hidden;SubCommand>] ValidatePackages
@@ -28,7 +29,8 @@ with
2829
member this.Usage =
2930
match this with
3031
| Clean -> "clean known output locations"
31-
| Build -> "Run build and tests"
32+
| Build -> "Run build"
33+
| Test -> "Run build and tests"
3234
| Release -> "runs build, and create an validates the packages shy of publishing them"
3335
| Publish -> "Runs the full release"
3436

build/scripts/Targets.fs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ let private clean (arguments:ParseResults<Arguments>) =
3737

3838
let private build (arguments:ParseResults<Arguments>) = exec "dotnet" ["build"; "-c"; "Release"] |> ignore
3939

40+
let private test (arguments:ParseResults<Arguments>) = exec "dotnet" ["test"; "-c"; "Release"] |> ignore
41+
4042
let private pristineCheck (arguments:ParseResults<Arguments>) =
4143
match Information.isCleanWorkingCopy "." with
4244
| true -> printfn "The checkout folder does not have pending changes, proceeding"
@@ -141,7 +143,8 @@ let Setup (parsed:ParseResults<Arguments>) (subCommand:Arguments) =
141143

142144
step Clean.Name clean
143145
cmd Build.Name None (Some [Clean.Name]) <| fun _ -> build parsed
144-
146+
cmd Test.Name None (Some [Build.Name]) <| fun _ -> test parsed
147+
145148
step PristineCheck.Name pristineCheck
146149
step GeneratePackages.Name generatePackages
147150
step ValidatePackages.Name validatePackages

src/Elastic.Elasticsearch.Ephemeral/Tasks/IClusterComposeTask.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,8 @@ private static void ExecuteBinaryInternal(EphemeralClusterConfiguration config,
168168
ConsoleOutWriter = new ConsoleOutColorWriter(),
169169
};
170170

171+
writer.WriteDiagnostic($"{binary} {string.Join(" ", arguments)}");
172+
171173
var result = Proc.Start(processStartArguments);
172174

173175
if (!result.Completed)

src/Elastic.Elasticsearch.Managed/ElasticsearchNode.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,7 @@ public IDisposable SubscribeLines(IConsoleLineHandler writer, Action<LineOut> on
116116
var node = NodeConfiguration.DesiredNodeName;
117117
writer?.WriteDiagnostic($"Elasticsearch location: [{Binary}]", node);
118118
writer?.WriteDiagnostic($"Settings: {{{string.Join(" ", NodeConfiguration.CommandLineArguments)}}}", node);
119+
writer?.WriteDiagnostic($"Environment: {{{string.Join(" ", StartArguments.Environment)}}}", node);
119120

120121
var envVarName = NodeConfiguration.Version.InRange("<7.12.0") ? "JAVA_HOME" : "ES_JAVA_HOME";
121122
var javaHome = Environment.GetEnvironmentVariable(envVarName);

0 commit comments

Comments
 (0)