Skip to content

Commit 2458f16

Browse files
committed
Better dependency order in FAKE
1 parent e9acbba commit 2458f16

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

src/BlackFox.MasterOfFoo.Build/Tasks.fs

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,18 @@ let createAndGetDefault () =
130130
Trace.publish ImportData.BuildArtifact zipFile
131131
}
132132

133-
let gitHubRelease = BuildTask.create "GitHubRelease" [zip] {
133+
let gitRelease = BuildTask.create "GitRelease" [nuget.IfNeeded] {
134+
let remote =
135+
Git.CommandHelper.getGitResult "" "remote -v"
136+
|> Seq.filter (fun (s: string) -> s.EndsWith("(push)"))
137+
|> Seq.tryFind (fun (s: string) -> s.Contains(gitOwner + "/" + gitName))
138+
|> function None -> gitHome + "/" + gitName | Some (s: string) -> s.Split().[0]
139+
140+
Git.Branches.tag "" release.NugetVersion
141+
Git.Branches.pushTag "" remote release.NugetVersion
142+
}
143+
144+
let gitHubRelease = BuildTask.create "GitHubRelease" [zip; gitRelease.IfNeeded] {
134145
let user =
135146
match Environment.environVarOrNone "github-user" with
136147
| Some s -> s
@@ -153,17 +164,6 @@ let createAndGetDefault () =
153164
|> Async.RunSynchronously
154165
}
155166

156-
let gitRelease = BuildTask.create "GitRelease" [] {
157-
let remote =
158-
Git.CommandHelper.getGitResult "" "remote -v"
159-
|> Seq.filter (fun (s: string) -> s.EndsWith("(push)"))
160-
|> Seq.tryFind (fun (s: string) -> s.Contains(gitOwner + "/" + gitName))
161-
|> function None -> gitHome + "/" + gitName | Some (s: string) -> s.Split().[0]
162-
163-
Git.Branches.tag "" release.NugetVersion
164-
Git.Branches.pushTag "" remote release.NugetVersion
165-
}
166-
167167
let _releaseTask = BuildTask.createEmpty "Release" [clean; gitRelease; gitHubRelease; publishNuget]
168168
let _ciTask = BuildTask.createEmpty "CI" [clean; runTests; zip; nuget]
169169

0 commit comments

Comments
 (0)