Skip to content

Commit f501a8b

Browse files
authored
Merge pull request #83 from lsaudon/main
Bump Workflows and fix markdown files
2 parents 53c81da + 7477a79 commit f501a8b

File tree

5 files changed

+60
-65
lines changed

5 files changed

+60
-65
lines changed

.github/workflows/docs.yml

Lines changed: 28 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -3,45 +3,44 @@ name: Release docs
33
on:
44
schedule:
55
# Triggers the workflow every day at 17:30 UTC
6-
- cron: '30 17 * * *'
6+
- cron: "30 17 * * *"
77
push:
88
branches:
99
- main
1010
workflow_dispatch:
1111

1212
jobs:
1313
build:
14-
1514
strategy:
1615
matrix:
1716
os: [windows-latest]
18-
dotnet: [6.0.203]
17+
dotnet: [6.0.302]
1918
runs-on: ${{ matrix.os }}
2019

2120
steps:
22-
- uses: actions/checkout@v2
23-
- name: Setup .NET Core
24-
uses: actions/setup-dotnet@v1
25-
with:
26-
dotnet-version: 6.0.203
27-
- name: Restore tools
28-
run: dotnet tool restore
29-
- name: Restore projects
30-
run: dotnet restore FSharp.Core\FSharp.Core.fsproj
31-
- name: Checkout fsharp master
32-
run: git clone https://github.com/dotnet/fsharp --depth 1 fsharp -b main
33-
- name: Build fsharp master (turn of CI build status)
34-
run: cd fsharp && eng\CIBuild.cmd
35-
- name: Checkout FSharp.Formatting master
36-
run: git clone https://github.com/fsprojects/FSharp.Formatting --depth 1 FSharp.Formatting
37-
- name: Build FSharp.Formatting master
38-
run: cd FSharp.Formatting && .\build -t Build
39-
- name: Run fsdocs
40-
run: dotnet FSharp.Formatting\src\fsdocs-tool\bin\Release\net6.0\fsdocs.dll build --sourcefolder fsharp
41-
- name: Deploy
42-
uses: peaceiris/actions-gh-pages@v3
43-
with:
44-
personal_token: ${{ secrets.GITHUB_TOKEN }}
45-
publish_dir: ./output
46-
publish_branch: gh-pages
47-
force_orphan: true
21+
- uses: actions/checkout@v3
22+
- name: Setup .NET Core
23+
uses: actions/setup-dotnet@v2
24+
with:
25+
dotnet-version: 6.0.302
26+
- name: Restore tools
27+
run: dotnet tool restore
28+
- name: Restore projects
29+
run: dotnet restore FSharp.Core\FSharp.Core.fsproj
30+
- name: Checkout fsharp master
31+
run: git clone https://github.com/dotnet/fsharp --depth 1 fsharp -b main
32+
- name: Build fsharp master (turn of CI build status)
33+
run: cd fsharp && eng\CIBuild.cmd
34+
- name: Checkout FSharp.Formatting master
35+
run: git clone https://github.com/fsprojects/FSharp.Formatting --depth 1 FSharp.Formatting
36+
- name: Build FSharp.Formatting master
37+
run: cd FSharp.Formatting && .\build -t Build
38+
- name: Run fsdocs
39+
run: dotnet FSharp.Formatting\src\fsdocs-tool\bin\Release\net6.0\fsdocs.dll build --sourcefolder fsharp
40+
- name: Deploy
41+
uses: peaceiris/actions-gh-pages@v3
42+
with:
43+
personal_token: ${{ secrets.GITHUB_TOKEN }}
44+
publish_dir: ./output
45+
publish_branch: gh-pages
46+
force_orphan: true

.github/workflows/pr.yml

Lines changed: 21 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -3,34 +3,33 @@ name: Pull request checks
33
on:
44
pull_request:
55
branches:
6-
- '**'
6+
- "**"
77

88
jobs:
99
build:
10-
1110
strategy:
1211
matrix:
1312
os: [windows-latest]
14-
dotnet: [6.0.203]
13+
dotnet: [6.0.302]
1514
runs-on: ${{ matrix.os }}
1615

1716
steps:
18-
- uses: actions/checkout@v2
19-
- name: Setup .NET Core
20-
uses: actions/setup-dotnet@v1
21-
with:
22-
dotnet-version: 6.0.203
23-
- name: Restore tools
24-
run: dotnet tool restore
25-
- name: Restore projects
26-
run: dotnet restore FSharp.Core\FSharp.Core.fsproj
27-
- name: Checkout fsharp master
28-
run: git clone https://github.com/dotnet/fsharp --depth 1 fsharp -b main
29-
- name: Build fsharp master (turn of CI build status)
30-
run: cd fsharp && eng\CIBuild.cmd
31-
- name: Checkout FSharp.Formatting master
32-
run: git clone https://github.com/fsprojects/FSharp.Formatting --depth 1 FSharp.Formatting
33-
- name: Build FSharp.Formatting master
34-
run: cd FSharp.Formatting && .\build -t Build
35-
- name: Run fsdocs
36-
run: dotnet FSharp.Formatting\src\fsdocs-tool\bin\Release\net5.0\fsdocs.dll build --sourcefolder fsharp
17+
- uses: actions/checkout@v3
18+
- name: Setup .NET Core
19+
uses: actions/setup-dotnet@v2
20+
with:
21+
dotnet-version: 6.0.302
22+
- name: Restore tools
23+
run: dotnet tool restore
24+
- name: Restore projects
25+
run: dotnet restore FSharp.Core\FSharp.Core.fsproj
26+
- name: Checkout fsharp master
27+
run: git clone https://github.com/dotnet/fsharp --depth 1 fsharp -b main
28+
- name: Build fsharp master (turn of CI build status)
29+
run: cd fsharp && eng\CIBuild.cmd
30+
- name: Checkout FSharp.Formatting master
31+
run: git clone https://github.com/fsprojects/FSharp.Formatting --depth 1 FSharp.Formatting
32+
- name: Build FSharp.Formatting master
33+
run: cd FSharp.Formatting && .\build -t Build
34+
- name: Run fsdocs
35+
run: dotnet FSharp.Formatting\src\fsdocs-tool\bin\Release\net5.0\fsdocs.dll build --sourcefolder fsharp

CODE_OF_CONDUCT.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,9 @@ members of the project's leadership.
6868
## Attribution
6969

7070
This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
71-
available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
71+
available at <https://www.contributor-covenant.org/version/1/4/code-of-conduct.html>
7272

7373
[homepage]: https://www.contributor-covenant.org
7474

7575
For answers to common questions about this code of conduct, see
76-
https://www.contributor-covenant.org/faq
76+
<https://www.contributor-covenant.org/faq>

README.md

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,31 @@
11
# FSharp.Core API documentation generation
22

3-
https://fsharp.github.io/fsharp-core-docs
3+
<https://fsharp.github.io/fsharp-core-docs>
44

55
## Contributing to Library Content
66

77
To improve the content of the F# Core library documentation, contribute to the XML `///` documentation in the
88
signature files (`*.fsi`) in the FSharp.Core implementation.
99

10-
* Fork and clone https://github.com/dotnet/fsharp locally, see below, as a subdirectory of your copy of `fsharp-core-docs`
10+
* Fork and clone <https://github.com/dotnet/fsharp> locally, see below, as a subdirectory of your copy of `fsharp-core-docs`
1111

12-
* Contribute to [the FSharp.Core directory ](https://github.com/dotnet/fsharp/tree/master/src/fsharp/FSharp.Core)
12+
* Contribute to [the FSharp.Core directory](https://github.com/dotnet/fsharp/tree/master/src/fsharp/FSharp.Core)
1313

1414
* Use a local build, see below
1515

16-
* Submit work to `main` branch of https://github.com/dotnet/fsharp
16+
* Submit work to `main` branch of <https://github.com/dotnet/fsharp>
1717

1818
* Once accepted your work will be published through a rebuild here. Site rebuilds daily at 17:30 UTC, or submit a dummy pull request here to trigger.
1919

2020
## Contributing to Generation of API Docs
2121

2222
The docs are generated by using `fsdocs` tool from FSharp.Formatting. If you want to improve the generation process:
2323

24-
* Contribute to the API Docs mode and/or HTML generator in [FSharp.Formatting.ApiDocs](https://github.com/fsprojects/FSharp.Formatting/tree/master/src/FSharp.Formatting.ApiDocs) and [the `fsdocs` tool](https://github.com/fsprojects/FSharp.Formatting/tree/master/src/FSharp.Formatting.CommandTool)
24+
* Contribute to the API Docs mode and/or HTML generator in [FSharp.Formatting.ApiDocs](https://github.com/fsprojects/FSharp.Formatting/tree/master/src/FSharp.Formatting.ApiDocs) and [the `fsdocs` tool](https://github.com/fsprojects/FSharp.Formatting/tree/master/src/FSharp.Formatting.CommandTool)
2525

2626
* Use a local copy of these, see below, as a subdirectory of fsharp-core-docs
2727

28-
* Submit work to the `master` branch of https://github.com/fsprojects/FSharp.Formatting
28+
* Submit work to the `master` branch of <https://github.com/fsprojects/FSharp.Formatting>
2929

3030
* Once accepted the new tooling will be published through a rebuild here, so submit a dummy pull request here that increments dummyVersion.txt
3131

@@ -44,7 +44,6 @@ This template is *not* the long term plan (unless it is improved enough). We ca
4444

4545
Whatever improvements you make should eventually get copied across back into FSharp.Formatting (and the duplicated template and styling will then likely be removed from this repo once it's no longer needed). If the design diverges to be a completely different look and feel then we can make several templates available in FSharp.Formatting with this as one of them.
4646

47-
4847
## Build steps
4948

5049
Eventually the build will just be
@@ -71,7 +70,7 @@ For now, we want to pick up the latest copies of FSharp.Formatting and FSharp.Co
7170
pushd FSharp.Formatting
7271
.\build -t Build
7372
popd
74-
73+
7574
Then do iterative development using:
7675

7776
(from 'fsharp-core-docs')
@@ -88,5 +87,3 @@ To build the very latest and freshest docs using the latest `fsdocs` tooling the
8887
2. builds `FSharp.Formatting` master branch
8988

9089
3. Uses that `FSharp.Formatting` tool to build the docs for the FSharp.Core built in step 1
91-
92-

docs/index.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ The following namespaces are available:
2020

2121
* [FSharp.Reflection](reference/fsharp-reflection.html) - Library functionality for accessing additional information about F# types and F# values at runtime, augmenting that available through [System.Reflection](https://docs.microsoft.com/dotnet/api/system.reflection). See also [F# Reflection](https://en.wikibooks.org/wiki/F_Sharp_Programming/Reflection) in the F# Wiki Book.
2222

23-
* [FSharp.NativeInterop](reference/fsharp-nativeinterop.html) - Basic functionality for native interopability. See also [F# External Functions](https://docs.microsoft.com/en-us/dotnet/fsharp/language-reference/functions/external-functions) in the F# Language Guide.
23+
* [FSharp.NativeInterop](reference/fsharp-nativeinterop.html) - Basic functionality for native interopability. See also [F# External Functions](https://docs.microsoft.com/en-us/dotnet/fsharp/language-reference/functions/external-functions) in the F# Language Guide.
2424

25-
* [FSharp.Core.CompilerServices](reference/fsharp-core-compilerservices.html) - Library functionality for supporting type providers and code generated by the F# compiler. See also [F# Type Providers](https://docs.microsoft.com/en-us/dotnet/fsharp/tutorials/type-providers/) in the F# Language Guide.
25+
* [FSharp.Core.CompilerServices](reference/fsharp-core-compilerservices.html) - Library functionality for supporting type providers and code generated by the F# compiler. See also [F# Type Providers](https://docs.microsoft.com/en-us/dotnet/fsharp/tutorials/type-providers/) in the F# Language Guide.
2626

2727
## Contributing to this documentation
2828

0 commit comments

Comments
 (0)