Skip to content

Commit a43c301

Browse files
authored
Update ci.yml
1 parent f547c34 commit a43c301

File tree

1 file changed

+8
-31
lines changed

1 file changed

+8
-31
lines changed

.github/workflows/ci.yml

Lines changed: 8 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -21,55 +21,32 @@ jobs:
2121
matrix:
2222
toolchain: ["beta"]
2323
target: ["x86_64-unknown-linux-gnu", "x86_64-pc-windows-msvc", "i686-pc-windows-msvc", "aarch64-apple-darwin"]
24-
dotnet: ["6.0", "7.0", "8.0"]
24+
dotnet: ["8.0", "9.0", "10.0"]
2525
include:
2626
- target: x86_64-unknown-linux-gnu
2727
os: ubuntu-latest
28-
dotnet_install_download_script: curl -sSL https://dot.net/v1/dotnet-install.sh > dotnet-install.sh; chmod +x dotnet-install.sh
29-
dotnet_install_script: ./dotnet-install.sh
28+
platform: linux
3029
arch: x64
3130
- target: x86_64-pc-windows-msvc
3231
os: windows-latest
33-
dotnet_install_download_script: Invoke-WebRequest -Uri https://dot.net/v1/dotnet-install.ps1 -OutFile dotnet-install.ps1
34-
dotnet_install_script: ./dotnet-install.ps1
32+
platform: windows
3533
arch: x64
3634
- target: i686-pc-windows-msvc
3735
os: windows-latest
38-
dotnet_install_download_script: Invoke-WebRequest -Uri https://dot.net/v1/dotnet-install.ps1 -OutFile dotnet-install.ps1
39-
dotnet_install_script: ./dotnet-install.ps1
36+
platform: windows
4037
arch: x86
41-
- target: x86_64-apple-darwin
38+
- target: aarch64-apple-darwin
4239
os: macos-latest
43-
dotnet_install_download_script: curl -sSL https://dot.net/v1/dotnet-install.sh > dotnet-install.sh; chmod +x dotnet-install.sh
44-
dotnet_install_script: ./dotnet-install.sh
45-
arch: x64
40+
platform: linux
41+
arch: arm64
4642
env:
4743
NETCOREHOST_TEST_NETCORE_VERSION: net${{ matrix.dotnet }}
4844
steps:
4945
- uses: actions/checkout@v3
5046

5147
- name: Install .NET SDK ${{ matrix.dotnet }}
5248
run: |
53-
${{ matrix.dotnet_install_download_script }}
54-
${{ matrix.dotnet_install_script }} -Architecture ${{ matrix.arch }} -Channel 6.0
55-
${{ matrix.dotnet_install_script }} -Architecture ${{ matrix.arch }} -Channel 7.0
56-
${{ matrix.dotnet_install_script }} -Architecture ${{ matrix.arch }} -Channel 8.0
57-
58-
if ($Env:DOTNET_INSTALL_DIR) {
59-
$dotnetRoot = $Env:DOTNET_INSTALL_DIR
60-
} else {
61-
if ([System.Environment]::OSVersion.Platform -eq "Win32NT") {
62-
$dotnetRoot = [IO.Path]::Combine($Env:LOCALAPPDATA, "Microsoft", "dotnet")
63-
} else {
64-
$dotnetRoot = [IO.Path]::Combine($Env:HOME, ".dotnet")
65-
}
66-
}
67-
68-
$dotnetRoot >> $env:GITHUB_PATH
69-
"DOTNET_ROOT=$dotnetRoot" >> $env:GITHUB_ENV
70-
71-
dotnet --info
72-
shell: pwsh
49+
.github/scripts/install-dotnet-${{ matrix.platform }} ${{ matrix.dotnet }} ${{ matrix.arch }}
7350
7451
- name: Check .NET Installation
7552
run: dotnet --info

0 commit comments

Comments
 (0)