Skip to content

Commit 9ce0e19

Browse files
committed
ci: tryfixit
1 parent 561d62b commit 9ce0e19

File tree

3 files changed

+20
-14
lines changed

3 files changed

+20
-14
lines changed

.github/workflows/docs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ jobs:
2626
env:
2727
DOTNET_LAUNCH_PROFILE: "none"
2828
steps:
29-
- uses: actions/checkout@v4
29+
- uses: actions/checkout@v5
3030
- name: Setup .NET
3131
uses: actions/setup-dotnet@v4
3232
with:
33-
dotnet-version: 9.0.x
33+
global-json-file: ./global.json
3434
- name: Cache Perla packages
3535
uses: actions/cache@v4
3636
with:

.github/workflows/main.yml

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -37,18 +37,12 @@ concurrency:
3737
jobs:
3838
build:
3939
runs-on: ubuntu-latest
40-
strategy:
41-
matrix:
42-
dotnet: [8.0.x, 9.0.x]
4340
steps:
44-
- uses: actions/checkout@v4
41+
- uses: actions/checkout@v5
4542
- name: Setup .NET Core
4643
uses: actions/setup-dotnet@v4
47-
id: stepid
4844
with:
49-
dotnet-version: |
50-
9.0.x
51-
8.0.x
45+
global-json-file: global.json
5246
- name: Install local tools
5347
run: dotnet tool restore
5448
- name: Restore Solution
@@ -57,5 +51,7 @@ jobs:
5751
run: dotnet fsi tools.fsx
5852
- name: Prepare Esbuild
5953
run: dotnet fsi esbuild-ci.fsx
60-
- name: Test
61-
run: dotnet fsi tools.fsx -- test
54+
- name: Test .NET 8
55+
run: dotnet fsi tools.fsx -- test -f=net8.0
56+
- name: Test .NET 10
57+
run: dotnet fsi tools.fsx -- test -f=net10.0

tools.fsx

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,13 +162,23 @@ module Steps =
162162
}
163163

164164
let build = Step.create "build" {
165-
do! Operations.dotnet "build src/Perla/Perla.fsproj --no-restore"
165+
do! Operations.dotnet $"build src/Perla/Perla.fsproj --no-restore"
166166
}
167167

168168
let format = Step.create "format" { do! Operations.fantomas "format" }
169169

170170
let test = Step.create "tests" {
171-
do! Operations.dotnet "test tests/Perla.Tests --no-restore"
171+
let! ctx = Step.context
172+
173+
let framework =
174+
ctx.ExtraArgs
175+
|> List.tryPick (function
176+
| "-f=net8.0" -> Some "net8.0"
177+
| "-f=net10.0" -> Some "net10.0"
178+
| _ -> None)
179+
|> Option.defaultValue "net10.0"
180+
181+
do! Operations.dotnet $"test tests/Perla.Tests --no-restore -f {framework}"
172182
}
173183

174184
let pushNugets = Step.create "nuget" {

0 commit comments

Comments
 (0)