Skip to content

Commit 708aefb

Browse files
committed
try fix ci still
1 parent 154c4dc commit 708aefb

File tree

2 files changed

+6
-15
lines changed

2 files changed

+6
-15
lines changed

.github/scripts/install-dotnet-windows.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@ if ($Env:DOTNET_INSTALL_DIR) {
1212
$dotnetRoot = Join-Path $Env:LOCALAPPDATA "Microsoft\dotnet"
1313
}
1414

15-
$dotnetRoot >> $Env:GITHUB_PATH
16-
"DONET_ROOT=$dotnetRoot" >> $Env:GITHUB_ENV
15+
Add-Content -Path $Env:GITHUB_PATH -Value $dotnetRoot
16+
Add-Content -Path $Env:GITHUB_ENV -Value "DOTNET_ROOT=$dotnetRoot"

.github/scripts/uninstall-dotnet-macos

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,24 +4,15 @@
44
latest_release_json=$(curl -s https://api.github.com/repos/dotnet/cli-lab/releases/latest)
55
download_url=$(echo "$latest_release_json" | grep "browser_download_url" | grep "osx-x64.tar.gz" | cut -d '"' -f 4)
66
filename=$(basename "$download_url")
7+
echo $download_url
8+
echo $filename
9+
echo $latest_release_json
710
curl -L -o "$filename" "$download_url"
811

912
# Prepare uninstall tool
1013
tar -xzf "$filename"
1114
uninstall_tool_path=$(find . -name dotnet-core-uninstall)
12-
chmod +x "$tool_path"
13-
# wait for the tool to be ready
14-
max_retries=30
15-
retry=0
16-
while [[ ! -f "$uninstall_tool_path" && $retry -lt $max_retries ]]; do
17-
sleep 1
18-
((retry++))
19-
done
20-
if [[ $retry -eq $max_retries ]]; then
21-
echo "Uninstall tool was not found after $max_retries seconds." >&2
22-
cat "log.txt"
23-
exit 1
24-
fi
15+
chmod +x "$uninstall_tool_path"
2516

2617
# Perform uninstall
2718
"$uninstall_tool_path" remove --yes --force --all --aspnet-runtime --verbosity detailed

0 commit comments

Comments
 (0)