Skip to content

Commit

Permalink
Backport #332: Bolero.Html on net8.0 + use .NET 8 SDK RTM
Browse files Browse the repository at this point in the history
  • Loading branch information
Tarmil committed Nov 18, 2023
2 parents 965533b + 1e98ed5 commit bddca8d
Show file tree
Hide file tree
Showing 6 changed files with 34 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .config/dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"isRoot": true,
"tools": {
"paket": {
"version": "8.0.0-alpha002",
"version": "8.0.0",
"commands": [
"paket"
]
Expand Down
37 changes: 29 additions & 8 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,18 @@ on:
jobs:
build:
runs-on: ubuntu-latest
permissions:
contents: read
actions: read
checks: write
steps:
- name: Checkout
uses: actions/checkout@v1

- 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
Expand All @@ -33,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
Expand All @@ -46,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
Expand All @@ -62,7 +83,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
Expand All @@ -86,7 +107,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: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion build.ps1
Original file line number Diff line number Diff line change
@@ -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" }
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "8.0.100-rc.2.23502.2",
"version": "8.0.100",
"rollForward": "feature",
"allowPrerelease": true
}
Expand Down
2 changes: 1 addition & 1 deletion src/Bolero.Html/Bolero.Html.fsproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFrameworks>net6.0;net8.0</TargetFrameworks>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<OutputType>Library</OutputType>
<RootNamespace>Bolero</RootNamespace>
Expand Down

0 comments on commit bddca8d

Please sign in to comment.