Skip to content

Commit 2454c65

Browse files
committed
adapt new test running pipeline for ci
1 parent a7fa141 commit 2454c65

2 files changed

Lines changed: 7 additions & 2 deletions

File tree

.github/workflows/build-and-test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
run: chmod u+x build.sh
2323
- name: Build and test
2424
working-directory: ./
25-
run: ./build.sh runtests
25+
run: ./build.sh runtestsallnonetfx
2626

2727
build-and-test-windows:
2828

@@ -36,4 +36,4 @@ jobs:
3636
dotnet-version: 6.x.x
3737
- name: Build and test (includes netfx)
3838
working-directory: ./
39-
run: ./build.cmd runtestsnetfx
39+
run: ./build.cmd runtestsall

build/TestTasks.fs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ let createTestBuildTask (name: string) (deps: BuildTask.TaskInfo list) (projects
2020
}
2121

2222
let buildTestsAll = createTestBuildTask "BuildTestsAll" [clean; build] (testProjectsCore @ testProjectsExtensionsLibs @ testProjectsNetFX)
23+
24+
let buildTestsAllNoNetFX = createTestBuildTask "BuildTestsAllNoNetFX" [clean; build] (testProjectsCore @ testProjectsExtensionsLibs)
2325

2426
let buildTestsCore = createTestBuildTask "BuildTestsCore" [clean; build] testProjectsCore
2527

@@ -45,6 +47,9 @@ let createRunTestTask (name: string) (deps: BuildTask.TaskInfo list) (projects:
4547
/// runs the all test projects via `dotnet test`
4648
let runTestsAll = createRunTestTask "RunTestsAll" [ clean; build; buildTestsAll ] (testProjectsCore @ testProjectsExtensionsLibs @ testProjectsNetFX)
4749

50+
/// runs the all test projects except those targeting netfx via `dotnet test`
51+
let runTestsAllNoNetFX = createRunTestTask "RunTestsAllNoNetFX" [ clean; build; buildTestsAllNoNetFX ] (testProjectsCore @ testProjectsExtensionsLibs)
52+
4853
/// runs the core test projects via `dotnet test`
4954
let runTestsCore = createRunTestTask "RunTestsCore" [ clean; build; buildTestsCore; buildTestsCore] testProjectsCore
5055

0 commit comments

Comments
 (0)