fiddle with pipeline

dsyme · dsyme · commit a22d2981f9d5 · 2020-07-31T03:15:04.000+01:00
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -25,13 +25,13 @@ jobs:
     - name: Restore dependencies
       run: dotnet paket restore
     - name: Checkout fsharp master
-      run: git clone https://github.com/dotnet/fsharp --depth 1 fsharp
+      run: git clone https://github.com/dotnet/fsharp --depth 1 fsharp -b feature/docs
     - name: Build fsharp master
-      run: cd fsharp && .\build
+      run: cd fsharp && .\build -noVisualStudio
     - name: Checkout FSharp.Formatting master
-      run: git clone https://github.com/dotnet/FSharp.Formatting --depth 1 FSharp.Formatting
+      run: git clone https://github.com/dotnet/FSharp.Formatting --depth 1 FSharp.Formatting 
     - name: Build FSharp.Formatting master
-      run: cd FSharp.Formatting && .\build
+      run: cd FSharp.Formatting && .\build -t Build
     - name: Run fsdocs
       run: FSharp.Formatting\src\FSharp.Formatting.CommandTool\bin\Release\netcoreapp3.1\fsdocs.exe build --sourcefolder fsharp
     - name: Deploy
diff --git a/README.md b/README.md
@@ -27,4 +27,13 @@ Change the `TargetPath` in our local `FSharp.Core.fsproj` if needed to picl up a
 
 ## CI Pipeline
 
-This repo is published via GitHub Actions. On each push to master, `dotnet fornax build` is run, and the outputs (which are written to the `_public` directory by fornax) are pushed to the `gh-pages` branch. This repo is configured to host using GitHub Pages from this branch, so once the generated files are pushed the update is nearly-instant.
+This repo is published via GitHub Actions. On each push to master, the docs are built, and the outputs (which are written to the `output` directory by fsdocs) are pushed to the `gh-pages` branch. This repo is configured to host using GitHub Pages from this branch, so once the generated files are pushed the update is nearly-instant.
+
+To build the very latest and freshest docs using the latest `fsdocs` tooling the CI does this:
+
+1. build dotnet/fsharp `feature/docs` branch (where we assume latest doc updates have been pushed)
+
+2. builds `FSharp.Formatting` master branch
+
+3. Uses that `FSharp.Formatting` tool to build the docs for the FSharp.Core built in step 1
+
