Merge pull request fsharp#91 from nojaf/fix-docs

Get required SDKs for both projects.
nojaf · Apr 13, 2023 · 949ef2b · 949ef2b
2 parents 6c65546 + e97fc82
commit 949ef2b
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 22 deletions.
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -23,22 +23,20 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
-      - name: Setup .NET Core
-        uses: actions/setup-dotnet@v3
-        with:
-          dotnet-version: |
-            7.0.100
-            7.0.202
-      - name: Restore tools
-        run: dotnet tool restore
-      - name: Restore projects
-        run: dotnet restore FSharp.Core\FSharp.Core.fsproj
       - name: Checkout fsharp main
         uses: actions/checkout@v3
         with:
           repository: dotnet/fsharp
           path: ${{ env.FSHARP_DIR }}
           ref: main
+      - name: Setup .NET Core for FSharp
+        uses: actions/setup-dotnet@v3
+        with:
+          global-json-file: ${{ env.FSHARP_DIR }}/global.json
+      - name: Restore tools
+        run: dotnet tool restore
+      - name: Restore projects
+        run: dotnet restore FSharp.Core\FSharp.Core.fsproj
       - name: Build FSharp.Core in fsharp main
         run: dotnet build .\src\FSharp.Core\ /p:BUILDING_USING_DOTNET=true
         working-directory: ${{ env.FSHARP_DIR }}
@@ -48,11 +46,15 @@ jobs:
           repository: fsprojects/FSharp.Formatting
           path: ${{ env.FSF_DIR }}
           ref: main
+      - name: Setup .NET Core for FSharp.Formatting
+        uses: actions/setup-dotnet@v3
+        with:
+          global-json-file: ${{ env.FSF_DIR }}/global.json
       - name: Build FSharp.Formatting main
         run: .\build -t Build
         working-directory: ${{ env.FSF_DIR }}
       - name: Run fsdocs
-        run: dotnet FSharp.Formatting\src\fsdocs-tool\bin\Release\net7.0\fsdocs.dll build --sourcefolder ${{ env.FSHARP_DIR }}
+        run: dotnet FSharp.Formatting\src\fsdocs-tool\bin\Release\net6.0\fsdocs.dll build --sourcefolder ${{ env.FSHARP_DIR }}
       - name: Deploy
         uses: peaceiris/actions-gh-pages@v3
         with:

diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -18,22 +18,20 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
-      - name: Setup .NET Core
-        uses: actions/setup-dotnet@v3
-        with:
-          dotnet-version: |
-            7.0.100
-            7.0.202
-      - name: Restore tools
-        run: dotnet tool restore
-      - name: Restore projects
-        run: dotnet restore FSharp.Core\FSharp.Core.fsproj
       - name: Checkout fsharp main
         uses: actions/checkout@v3
         with:
           repository: dotnet/fsharp
           path: ${{ env.FSHARP_DIR }}
           ref: main
+      - name: Setup .NET Core for FSharp
+        uses: actions/setup-dotnet@v3
+        with:
+          global-json-file: ${{ env.FSHARP_DIR }}/global.json
+      - name: Restore tools
+        run: dotnet tool restore
+      - name: Restore projects
+        run: dotnet restore FSharp.Core\FSharp.Core.fsproj
       - name: Build FSharp.Core in fsharp main
         run: dotnet build .\src\FSharp.Core\ /p:BUILDING_USING_DOTNET=true
         working-directory: ${{ env.FSHARP_DIR }}
@@ -43,8 +41,12 @@ jobs:
           repository: fsprojects/FSharp.Formatting
           path: ${{ env.FSF_DIR }}
           ref: main
+      - name: Setup .NET Core for FSharp.Formatting
+        uses: actions/setup-dotnet@v3
+        with:
+          global-json-file: ${{ env.FSF_DIR }}/global.json
       - name: Build FSharp.Formatting main
         run: .\build -t Build
         working-directory: ${{ env.FSF_DIR }}
       - name: Run fsdocs
-        run: dotnet FSharp.Formatting\src\fsdocs-tool\bin\Release\net7.0\fsdocs.dll build --sourcefolder ${{ env.FSHARP_DIR }}
+        run: dotnet FSharp.Formatting\src\fsdocs-tool\bin\Release\net6.0\fsdocs.dll build --sourcefolder ${{ env.FSHARP_DIR }}