From 0e5e19f810623c47836becfebafbf20b192e37e0 Mon Sep 17 00:00:00 2001 From: nojaf Date: Tue, 28 Mar 2023 14:41:18 +0200 Subject: [PATCH 1/2] Only build FSharp.Core --- .github/workflows/docs.yml | 4 ++-- .github/workflows/pr.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index fe5b6f8c0..70f75e459 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -37,8 +37,8 @@ jobs: repository: dotnet/fsharp path: ${{ env.FSHARP_DIR }} ref: main - - name: Build fsharp main (turn of CI build status) - run: eng\CIBuild.cmd -noVisualStudio + - name: Build FSharp.Core in fsharp main + run: dotnet build .\src\FSharp.Core\ /p:BUILDING_USING_DOTNET=true working-directory: ${{ env.FSHARP_DIR }} - name: Checkout FSharp.Formatting main uses: actions/checkout@v3 diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 6a2bf2e03..edfcaa773 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -32,8 +32,8 @@ jobs: repository: dotnet/fsharp path: ${{ env.FSHARP_DIR }} ref: main - - name: Build fsharp main (turn of CI build status) - run: eng\CIBuild.cmd -noVisualStudio + - name: Build FSharp.Core in fsharp main + run: dotnet build .\src\FSharp.Core\ /p:BUILDING_USING_DOTNET=true working-directory: ${{ env.FSHARP_DIR }} - name: Checkout FSharp.Formatting main uses: actions/checkout@v3 From db574a846b805db36d35bc9ab7d12b41920739b1 Mon Sep 17 00:00:00 2001 From: nojaf Date: Tue, 28 Mar 2023 14:50:34 +0200 Subject: [PATCH 2/2] Install 7.0.202 as well. --- .github/workflows/docs.yml | 4 +++- .github/workflows/pr.yml | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 70f75e459..288d58c9e 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -26,7 +26,9 @@ jobs: - name: Setup .NET Core uses: actions/setup-dotnet@v3 with: - dotnet-version: 7.0.100 + dotnet-version: | + 7.0.100 + 7.0.202 - name: Restore tools run: dotnet tool restore - name: Restore projects diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index edfcaa773..4773b36cb 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -21,7 +21,9 @@ jobs: - name: Setup .NET Core uses: actions/setup-dotnet@v3 with: - dotnet-version: 7.0.100 + dotnet-version: | + 7.0.100 + 7.0.202 - name: Restore tools run: dotnet tool restore - name: Restore projects