Skip to content
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

URGENT: Bug Fix For Parallel From #1396 #1507

Merged
merged 3 commits into from
Mar 28, 2017
Merged

URGENT: Bug Fix For Parallel From #1396 #1507

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6f0a7fc
Add complex build order test
BlythMeister Mar 28, 2017
22ded81
Add "LevelRemain" Active Pattern to add dependency
BlythMeister Mar 28, 2017
ed2df1a
Ensure that a Target can never run at a level on or above one of its …
BlythMeister Mar 28, 2017
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
24 changes: 20 additions & 4 deletions src/app/FakeLib/TargetHelper.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -501,10 +501,20 @@ let determineBuildOrder (target : string) =
let rec SetTargetLevel newLevel target =
match targetLevels.TryGetValue target with
| true, exDependencyLevel ->
if exDependencyLevel.level < newLevel then
exDependencyLevel.dependants |> List.iter (fun x -> SetTargetLevel (newLevel - 1) x)
let minLevel = targetLevels
|> Seq.filter(fun x -> x.Value.dependants.Contains target)
|> Seq.map(fun x -> x.Value.level)
|> fun x -> match x.Any() with
| true -> x |> Seq.min
| _ -> -1

if exDependencyLevel.dependants.Length > 0 then
targetLevels.[target] <- {level = newLevel; dependants = exDependencyLevel.dependants}
if (exDependencyLevel.level < newLevel && newLevel < minLevel) || (exDependencyLevel.level > newLevel) then
targetLevels.[target] <- {level = newLevel; dependants = exDependencyLevel.dependants}

if exDependencyLevel.level < newLevel then
exDependencyLevel.dependants |> List.iter (fun x -> SetTargetLevel (newLevel - 1) x)

| _ -> ()

let addTargetLevel ((dependantTarget:option<TargetTemplate<unit>>), (target: TargetTemplate<unit>), _, level, _ ) =
Expand All @@ -520,18 +530,24 @@ let determineBuildOrder (target : string) =
| (true, exDependencyLevel), _ when exDependencyLevel.level < level -> Some (exDependencyLevel)
| _ -> None

let (|LevelRemain|_|) = function
| (true, exDependencyLevel), _ -> Some (exDependencyLevel)
| _ -> None

let (|NewTarget|_|) = function
| (false, _), _ -> Some ()
| _ -> None

match targetLevels.TryGetValue target.Name, dependantTarget with
| LevelIncreaseWithDependantTarget (exDependencyLevel, dt) ->
SetTargetLevel (exDependencyLevel.level - 1) dt.Name
targetLevels.[target.Name] <- {level = exDependencyLevel.level; dependants = (appendDepentantOption exDependencyLevel.dependants dependantTarget)}
SetTargetLevel (exDependencyLevel.level - 1) dt.Name
| LevelIncreaseWithNoDependantTarget (exDependencyLevel) ->
targetLevels.[target.Name] <- {level = exDependencyLevel.level; dependants = (appendDepentantOption exDependencyLevel.dependants dependantTarget)}
| LevelDecrease (exDependencyLevel) ->
targetLevels.[target.Name] <- {level = level; dependants = (appendDepentantOption exDependencyLevel.dependants dependantTarget)}
exDependencyLevel.dependants |> List.iter (fun x -> SetTargetLevel (level - 1) x)
| LevelRemain (exDependencyLevel) ->
targetLevels.[target.Name] <- {level = level; dependants = (appendDepentantOption exDependencyLevel.dependants dependantTarget)}
| NewTarget ->
targetLevels.[target.Name] <- {level = level; dependants=(appendDepentantOption [] dependantTarget)}
Expand Down
53 changes: 53 additions & 0 deletions src/test/FsCheck.Fake/TestParallelBuildOrder.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,59 @@ let ``Initial Targets Can Run Concurrently``() =
| _ ->
failwithf "unexpected order: %A" order

[<Fact>]
let ``BlythMeisters Scenario Of Complex Build Order Is Correct``() =
TargetDict.Clear()
Target "PrepareBuild" DoNothing
Target "CreateWholeCaboodle" DoNothing
Target "UpdateVersions" DoNothing
Target "PreBuildVerifications" DoNothing
Target "BuildWholeCaboodle" DoNothing
Target "RunUnitTests" DoNothing
Target "RunIntTests" DoNothing
Target "CreateDBNugets" DoNothing
Target "DropIntDatabases" DoNothing
Target "DeployIntDatabases" DoNothing
Target "CreateNugets" DoNothing
Target "PublishNugets" DoNothing

"PrepareBuild" ==> "CreateWholeCaboodle" |> ignore
"PrepareBuild" ==> "UpdateVersions" |> ignore
"CreateWholeCaboodle" ==> "PreBuildVerifications" |> ignore
"UpdateVersions" ==> "PreBuildVerifications" |> ignore
"PreBuildVerifications" ==> "BuildWholeCaboodle" |> ignore
"PreBuildVerifications" ==> "CreateDBNugets" |> ignore
"PreBuildVerifications" ==> "DropIntDatabases" |> ignore
"BuildWholeCaboodle" ==> "CreateNugets" |> ignore
"BuildWholeCaboodle" ==> "RunUnitTests" |> ignore
"BuildWholeCaboodle" ==> "RunIntTests" |> ignore
"CreateDBNugets" ==> "DeployIntDatabases" |> ignore
"DropIntDatabases" ==> "DeployIntDatabases" |> ignore
"DeployIntDatabases" ==> "RunIntTests" |> ignore
"CreateNugets" ==> "PublishNugets" |> ignore
"CreateDBNugets" ==> "PublishNugets" |> ignore
"RunUnitTests" ==> "PublishNugets" |> ignore
"RunIntTests" ==> "PublishNugets" |> ignore

let order = determineBuildOrder "PublishNugets"
validateBuildOrder order "PublishNugets"

match order with
| [
TargetSet ["PrepareBuild"];
TargetSet ["CreateWholeCaboodle"; "UpdateVersions"];
TargetSet ["PreBuildVerifications"];
TargetSet ["BuildWholeCaboodle"; "CreateDBNugets"; "DropIntDatabases"];
TargetSet ["CreateNugets"; "DeployIntDatabases"; "RunUnitTests"];
TargetSet ["RunIntTests"];
TargetSet ["PublishNugets"];
] ->
// as expected
()

| _ ->
failwithf "unexpected order: %A" order

[<Fact>]
let ``Spurs run as early as possible``() =
TargetDict.Clear()
Expand Down