Skip to content

Commit 1350577

Browse files
committed
update CI workflow to test 8+9 SDKs now
1 parent e5ef107 commit 1350577

File tree

1 file changed

+15
-24
lines changed

1 file changed

+15
-24
lines changed

.github/workflows/build.yml

Lines changed: 15 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@ jobs:
1818
env:
1919
TEST_TIMEOUT_MINUTES: 40
2020
FSAC_TEST_DEFAULT_TIMEOUT : 120000 #ms, individual test timeouts
21-
DOTNET_ROLL_FORWARD_TO_PRERELEASE: 1 # needed to allow .NET 8 RCs to participate in rollforward as expected.
21+
DOTNET_ROLL_FORWARD_TO_PRERELEASE: 1 # needed to allow .NET RCs to participate in rollforward as expected.
2222
timeout-minutes: 40 # we have a locking issue, so cap the runs at ~20m to account for varying build times, etc
2323
strategy:
2424
matrix:
2525
os:
2626
- windows-latest
2727
- macos-13 # using 13 because it's a bigger machine, and latest is still pointing to 12
2828
- ubuntu-latest
29-
dotnet-version: ["", "6.0.x", "7.0.x", "8.0.x"]
29+
dotnet-version: ["", "8.0.x", "9.0.x"]
3030
use-transparent-compiler:
3131
- "TransparentCompiler"
3232
- "BackgroundCompiler"
@@ -40,29 +40,22 @@ jobs:
4040
dotnet-version: ""
4141
include-prerelease: false
4242
label: "repo global.json"
43-
build_net7: false
44-
test_tfm: net6.0
45-
# latest 6.0
46-
- global-json-file: "global.json"
47-
dotnet-version: "6.0.x"
48-
include-prerelease: false
49-
label: "6.0"
50-
build_net7: false
51-
test_tfm: net6.0
52-
# latest 7.0
53-
- global-json-file: "global.json"
54-
dotnet-version: "7.0.x"
55-
include-prerelease: true
56-
label: "7.0"
57-
build_net7: true
58-
test_tfm: net7.0
43+
build_net9: false
44+
test_tfm: net8.0
5945
# latest 8.0
6046
- global-json-file: "global.json"
6147
dotnet-version: "8.0.x"
62-
include-prerelease: true
48+
include-prerelease: false
6349
label: "8.0"
64-
build_net8: true
50+
build_net9: false
6551
test_tfm: net8.0
52+
# latest 9.0
53+
- global-json-file: "global.json"
54+
dotnet-version: "9.0.x"
55+
include-prerelease: true
56+
label: "9.0"
57+
build_net9: true
58+
test_tfm: net9.0
6659
fail-fast: false # we have timing issues on some OS, so we want them all to run
6760

6861
runs-on: ${{ matrix.os }}
@@ -109,15 +102,13 @@ jobs:
109102
- name: Run Build
110103
run: dotnet build -c Release
111104
env:
112-
BuildNet7: ${{ matrix.build_net7 }}
113-
BuildNet8: ${{ matrix.build_net8 }}
105+
BuildNet9: ${{ matrix.build_net9 }}
114106

115107
- name: Run and report tests
116108
run: dotnet test -c Release -f ${{ matrix.test_tfm }} --no-restore --no-build --logger "console;verbosity=normal" --logger GitHubActions /p:AltCover=true /p:AltCoverAssemblyExcludeFilter="System.Reactive|FSharp.Compiler.Service|Ionide.ProjInfo|FSharp.Analyzers|Analyzer|Humanizer|FSharp.Core|FSharp.DependencyManager" -- Expecto.fail-on-focused-tests=true --blame-hang --blame-hang-timeout 1m
117109
working-directory: test/FsAutoComplete.Tests.Lsp
118110
env:
119-
BuildNet7: ${{ matrix.build_net7 }}
120-
BuildNet8: ${{ matrix.build_net8 }}
111+
BuildNet9: ${{ matrix.build_net9 }}
121112
USE_TRANSPARENT_COMPILER: ${{ matrix.use-transparent-compiler }}
122113
USE_WORKSPACE_LOADER: ${{ matrix.workspace-loader }}
123114

0 commit comments

Comments
 (0)