Skip to content

Commit 84e3adc

Browse files
authored
Merge pull request #74 from fsharp/baronfel-patch-1
2 parents ebbaf4d + b897ee2 commit 84e3adc

File tree

2 files changed

+36
-3
lines changed

2 files changed

+36
-3
lines changed

.github/workflows/docs.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@ jobs:
1212
strategy:
1313
matrix:
1414
os: [windows-latest]
15-
dotnet: [3.1.302]
15+
dotnet: [5.0.400]
1616
runs-on: ${{ matrix.os }}
1717

1818
steps:
1919
- uses: actions/checkout@v2
2020
- name: Setup .NET Core
2121
uses: actions/setup-dotnet@v1
2222
with:
23-
dotnet-version: 3.1.201
23+
dotnet-version: 5.0.400
2424
- name: Restore tools
2525
run: dotnet tool restore
2626
- name: Restore projects
@@ -34,7 +34,7 @@ jobs:
3434
- name: Build FSharp.Formatting master
3535
run: cd FSharp.Formatting && .\build -t Build
3636
- name: Run fsdocs
37-
run: FSharp.Formatting\src\FSharp.Formatting.CommandTool\bin\Release\netcoreapp3.1\fsdocs.exe build --sourcefolder fsharp
37+
run: dotnet FSharp.Formatting\src\FSharp.Formatting.CommandTool\bin\Release\net5.0\fsdocs.dll build --sourcefolder fsharp
3838
- name: Deploy
3939
uses: peaceiris/actions-gh-pages@v3
4040
with:

.github/workflows/pr.yml

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
name: Release docs
2+
3+
on: [push]
4+
5+
jobs:
6+
build:
7+
8+
strategy:
9+
matrix:
10+
os: [windows-latest]
11+
dotnet: [5.0.400]
12+
runs-on: ${{ matrix.os }}
13+
14+
steps:
15+
- uses: actions/checkout@v2
16+
- name: Setup .NET Core
17+
uses: actions/setup-dotnet@v1
18+
with:
19+
dotnet-version: 5.0.400
20+
- name: Restore tools
21+
run: dotnet tool restore
22+
- name: Restore projects
23+
run: dotnet restore FSharp.Core\FSharp.Core.fsproj
24+
- name: Checkout fsharp master
25+
run: git clone https://github.com/dotnet/fsharp --depth 1 fsharp -b main
26+
- name: Build fsharp master (turn of CI build status)
27+
run: cd fsharp && eng\CIBuild.cmd
28+
- name: Checkout FSharp.Formatting master
29+
run: git clone https://github.com/fsprojects/FSharp.Formatting --depth 1 FSharp.Formatting
30+
- name: Build FSharp.Formatting master
31+
run: cd FSharp.Formatting && .\build -t Build
32+
- name: Run fsdocs
33+
run: dotnet FSharp.Formatting\src\FSharp.Formatting.CommandTool\bin\Release\net5.0\fsdocs.dll build --sourcefolder fsharp

0 commit comments

Comments
 (0)