From d47a7d6786f628d23b33b8cd1928abc83bc047a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Denuzi=C3=A8re?= Date: Mon, 6 Nov 2023 19:29:24 +0100 Subject: [PATCH 1/6] Set version to 0.24-alpha --- version.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.json b/version.json index 8fb669f7..6cfe45ba 100644 --- a/version.json +++ b/version.json @@ -1,6 +1,6 @@ { "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json", - "version": "0.23-alpha", + "version": "0.24-alpha", "gitCommitIdShortAutoMinimum": 7, "nuGetPackageVersion": { "semVer": 2.0 From 1eb9ee3f3ce11968f6052f1a82d355f4a3d1ef33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Denuzi=C3=A8re?= Date: Thu, 16 Nov 2023 01:44:55 +0100 Subject: [PATCH 2/6] Add permission to upload checks from PR --- .github/workflows/build.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7217dd56..b130b5aa 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -9,6 +9,10 @@ on: jobs: build: runs-on: ubuntu-latest + permissions: + contents: read + actions: read + checks: write steps: - name: Checkout uses: actions/checkout@v1 From aef7346a26482cbb0e4e8c2403feff46cb9374d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Landsman?= Date: Wed, 15 Nov 2023 13:26:41 +0100 Subject: [PATCH 3/6] Update target frameworks in Bolero.Html.fsproj The project file for Bolero.Html has been updated to include both .NET 6.0 and .NET 8.0 as target frameworks. This extends compatibility and support for the library across these versions. --- src/Bolero.Html/Bolero.Html.fsproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Bolero.Html/Bolero.Html.fsproj b/src/Bolero.Html/Bolero.Html.fsproj index 136aac8c..ee632937 100644 --- a/src/Bolero.Html/Bolero.Html.fsproj +++ b/src/Bolero.Html/Bolero.Html.fsproj @@ -1,11 +1,11 @@ - net6.0 true Library Bolero true + net6.0;net8.0 From c997c5f522b9465ddc8b379ae42c7aa592f30067 Mon Sep 17 00:00:00 2001 From: Andrii Chebukin Date: Thu, 16 Nov 2023 17:37:00 +0400 Subject: [PATCH 4/6] Update everything to .NET 8.0 RTM --- .config/dotnet-tools.json | 2 +- .github/workflows/build.yml | 8 ++++---- .github/workflows/publish.yml | 2 +- global.json | 2 +- src/Bolero.Html/Bolero.Html.fsproj | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 5d1db430..39f873b5 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "paket": { - "version": "8.0.0-alpha002", + "version": "8.0.0", "commands": [ "paket" ] diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b130b5aa..95e5540d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,7 +20,7 @@ jobs: - name: Setup dotnet uses: actions/setup-dotnet@v1 with: - dotnet-version: '8.0.100-rc.2.23502.2' + dotnet-version: '8.0.100' - name: NuGet cache uses: actions/cache@v1 @@ -37,7 +37,7 @@ jobs: git checkout "$(echo ${{github.ref}} | sed -E 's|^refs/heads/||')"; fi # .NET 8 RC2 has a bug where it restores the wrong version of tools... - dotnet tool update paket --version 8.0.0-alpha002 + dotnet tool update paket --version 8.0.0 dotnet tool update nbgv --version 3.6.133 # Ensure that the selenium chrome driver matches the installed chrome ./build.ps1 -t update-chromedriver @@ -66,7 +66,7 @@ jobs: - name: Setup dotnet uses: actions/setup-dotnet@v1 with: - dotnet-version: '8.0.100-rc.2.23502.2' + dotnet-version: '8.0.100' - name: Download nupkg uses: actions/download-artifact@v1 @@ -90,7 +90,7 @@ jobs: - name: Setup dotnet uses: actions/setup-dotnet@v1 with: - dotnet-version: '8.0.100-rc.2.23502.2' + dotnet-version: '8.0.100' - name: Prepare run: | diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 323ed366..a3b19c17 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -11,7 +11,7 @@ jobs: - name: Setup dotnet uses: actions/setup-dotnet@v1 with: - dotnet-version: '8.0.100-rc.2.23502.2' + dotnet-version: '8.0.100' - name: Download nupkg uses: dawidd6/action-download-artifact@v2 diff --git a/global.json b/global.json index f8044b4f..35a65772 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "8.0.100-rc.2.23502.2", + "version": "8.0.100", "rollForward": "feature", "allowPrerelease": true } diff --git a/src/Bolero.Html/Bolero.Html.fsproj b/src/Bolero.Html/Bolero.Html.fsproj index ee632937..1ee34a73 100644 --- a/src/Bolero.Html/Bolero.Html.fsproj +++ b/src/Bolero.Html/Bolero.Html.fsproj @@ -1,11 +1,11 @@ + net6.0;net8.0 true Library Bolero true - net6.0;net8.0 From c5bc9ccfc5bb5e09dded6541be2f391060276c49 Mon Sep 17 00:00:00 2001 From: Andrii Chebukin Date: Thu, 16 Nov 2023 17:37:32 +0400 Subject: [PATCH 5/6] Fix Paket usage --- build.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.ps1 b/build.ps1 index 0206e68b..9514a4ec 100755 --- a/build.ps1 +++ b/build.ps1 @@ -1,6 +1,6 @@ #!/usr/bin/env pwsh dotnet tool restore -dotnet paket restore +dotnet tool run paket restore dotnet run --project .build -- $args if ($LastExitCode -ne 0) { throw "Build failed" } From 825e92a855afb8fa264034488928e5ebebbcd55a Mon Sep 17 00:00:00 2001 From: Andrii Chebukin Date: Thu, 16 Nov 2023 21:54:32 +0400 Subject: [PATCH 6/6] Attempt to fix PR build for forked repo --- .github/workflows/build.yml | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 95e5540d..bc176287 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -50,13 +50,30 @@ jobs: name: nuget path: build - - name: Report tests - uses: dorny/test-reporter@v1 + - name: Upload test results if: always() + uses: actions/upload-artifact@v2 with: - name: Unit tests + name: TestResults path: tests/Unit/TestResults/*.trx - reporter: dotnet-trx + + report: + needs: build + if: github.event.pull_request.head.repo.full_name == github.repository + runs-on: ubuntu-latest + + steps: + - name: Download test results + uses: actions/download-artifact@v2 + with: + name: TestResults + + - name: Report tests + uses: dorny/test-reporter@v1 + with: + name: Unit tests + path: TestResults/*.trx + reporter: dotnet-trx prerelease: runs-on: ubuntu-latest