Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 7 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,13 @@ jobs:
env:
CONFIGURATION: ${{ matrix.configuration }}
CI: true
- name: Test Report
uses: dorny/test-reporter@v1
if: always()
with:
name: Test Results (${{ matrix.os }}-${{ matrix.configuration }})
path: '**/TestResults/testResults*.trx'
reporter: dotnet-trx

# Builds the project in a dev container
build-devcontainer:
Expand Down
7 changes: 7 additions & 0 deletions Content/Console/.github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,13 @@ jobs:
env:
CONFIGURATION: ${{ matrix.configuration }}
CI: true
- name: Test Report
uses: dorny/test-reporter@v1
if: always()
with:
name: Test Results (${{ matrix.os }}-${{ matrix.configuration }})
path: '**/TestResults/testResults*.trx'
reporter: dotnet-trx
# Builds the project in a dev container
build-devcontainer:
runs-on: ubuntu-latest
Expand Down
1 change: 1 addition & 0 deletions Content/Console/build/build.fs
Original file line number Diff line number Diff line change
Expand Up @@ -345,6 +345,7 @@ let dotnetTest ctx =
c with
MSBuildParams = disableBinLog c.MSBuildParams
Configuration = configuration (ctx.Context.AllExecutingTargets)
Logger = Some "trx;LogFilePrefix=testResults"
Common =
c.Common
|> DotNet.Options.withAdditionalArgs args
Expand Down
7 changes: 7 additions & 0 deletions Content/Library/.github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,13 @@ jobs:
CI: true
CONFIGURATION: ${{ matrix.configuration }}
ENABLE_COVERAGE: true
- name: Test Report
uses: dorny/test-reporter@v1
if: always()
with:
name: Test Results (${{ matrix.os }}-${{ matrix.configuration }})
path: '**/TestResults/testResults*.trx'
reporter: dotnet-trx
# Builds the project in a dev container
build-devcontainer:
runs-on: ubuntu-latest
Expand Down
1 change: 1 addition & 0 deletions Content/Library/build/build.fs
Original file line number Diff line number Diff line change
Expand Up @@ -436,6 +436,7 @@ let dotnetTest ctx =
c with
MSBuildParams = disableBinLog c.MSBuildParams
Configuration = configuration (ctx.Context.AllExecutingTargets)
Logger = Some "trx;LogFilePrefix=testResults"
Common =
c.Common
|> DotNet.Options.withAdditionalArgs args
Expand Down
57 changes: 29 additions & 28 deletions build/build.fs
Original file line number Diff line number Diff line change
Expand Up @@ -351,35 +351,36 @@ let getPkgPath () =
let integrationTests ctx =
!!testsGlob
|> Seq.iter (fun proj ->
let runSettingsArgs =
if isCI.Value then
[
"--"
"Expecto.fail-on-focused-tests=true"
]
else
[]

dotnet.run
(fun c ->

let args =
[
// sprintf "-C %A" (configuration (ctx.Context.AllExecutingTargets))
sprintf "--project %s" proj
"--summary"
if isCI.Value then
"--fail-on-focused-tests"
]
|> String.concat " "

{
c with
CustomParams = Some args
Environment =
c.Environment
|> Map.add "MINISCAFFOLD_NUPKG_LOCATION" (getPkgPath ())
// Configuration = configuration (ctx.Context.AllExecutingTargets)
// Common =
// c.Common
// |> DotNet.Options.withCustomParams
// (Some(args))
}
)
""
|> failOnBadExitAndPrint
DotNet.test
(fun c -> {
c with
Configuration = configuration (ctx.Context.AllExecutingTargets)
Logger = Some "console;verbosity=detailed"
Common =
{
c.Common with
Environment =
c.Common.Environment
|> Map.add "MINISCAFFOLD_NUPKG_LOCATION" (getPkgPath ())
}
|> DotNet.Options.withAdditionalArgs (
[
"--logger"
"trx;LogFilePrefix=testResults"
]
@ runSettingsArgs
)
})
proj
)

let dotnetPack ctx =
Expand Down