Skip to content
Open
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
1 change: 1 addition & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ jobs:
env:
TEST_TIMEOUT_MINUTES: 30
FSAC_TEST_DEFAULT_TIMEOUT : 120000 #ms, individual test timeouts
MSBUILDLIVELOGGER: auto
timeout-minutes: 30 # we have a locking issue, so cap the runs at ~20m to account for varying build times, etc
strategy:
matrix:
Expand Down
12 changes: 5 additions & 7 deletions build/Program.fs
Original file line number Diff line number Diff line change
Expand Up @@ -94,12 +94,12 @@ let init args =

Target.create "Clean" (fun _ -> Shell.cleanDirs [ buildDir; buildReleaseDir; pkgsDir ])

Target.create "Restore" (fun _ -> DotNet.restore id "")

Target.create "Build" (fun _ ->
DotNet.build
(fun p -> { p with Configuration = DotNet.BuildConfiguration.fromString configuration })
"FsAutoComplete.sln")
DotNet.exec id "build" "-c Release FsAutoComplete.sln"
|> fun r ->
if not r.OK then
failwithf "Errors while building: %A" r.Errors
)

Target.create "EnsureRepoConfig" (fun _ ->
// Configure custom git hooks
Expand Down Expand Up @@ -173,8 +173,6 @@ let init args =
"PromoteUnreleasedToVersion" ==> "CreateVersionTag" ==> "Promote"
|> ignore<string>

"Restore" ==> "Build" |> ignore<string>

"Build" ==> "LspTest" ==> "Coverage" ==> "Test" ==> "All"
|> ignore<string>

Expand Down
1 change: 1 addition & 0 deletions build/build.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net7.0</TargetFramework>
<RollForward>Major</RollForward>
</PropertyGroup>
<ItemGroup>
<Compile Include="Program.fs" />
Expand Down
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "7.0.400-preview.23226.4",
"version": "8.0.100-preview.4.23228.11",
"allowPrerelease": true
}
}