未验证 提交 20c8ae64 编写于 作者: K Kunal Pathak 提交者: GitHub

Use fixed version of dotnet for Spmi benchmark (#75888)

* fixed dotnet version

* comment everything except benchmarks

* Add comment

* Revert "comment everything except benchmarks"

This reverts commit 1a6ae318ee6a1fadce7b662b36e9cf206f1acf43.
上级 482049ad
...@@ -37,6 +37,7 @@ ...@@ -37,6 +37,7 @@
import argparse import argparse
import os import os
import shutil
import stat import stat
from coreclr_arguments import * from coreclr_arguments import *
...@@ -376,6 +377,11 @@ def setup_microbenchmark(workitem_directory, arch): ...@@ -376,6 +377,11 @@ def setup_microbenchmark(workitem_directory, arch):
run_command( run_command(
["git", "clone", "--quiet", "--depth", "1", "https://github.com/dotnet/performance", performance_directory]) ["git", "clone", "--quiet", "--depth", "1", "https://github.com/dotnet/performance", performance_directory])
try:
shutil.rmtree(os.path.join(performance_directory, ".git"))
except Exception as ex:
print("Warning: failed to remove directory \"%s\": %s", os.path.join(performance_directory, ".git"), ex)
with ChangeDir(performance_directory): with ChangeDir(performance_directory):
dotnet_directory = os.path.join(performance_directory, "tools", "dotnet", arch) dotnet_directory = os.path.join(performance_directory, "tools", "dotnet", arch)
dotnet_install_script = os.path.join(performance_directory, "scripts", "dotnet.py") dotnet_install_script = os.path.join(performance_directory, "scripts", "dotnet.py")
...@@ -384,8 +390,11 @@ def setup_microbenchmark(workitem_directory, arch): ...@@ -384,8 +390,11 @@ def setup_microbenchmark(workitem_directory, arch):
print("Missing " + dotnet_install_script) print("Missing " + dotnet_install_script)
return return
# Sometimes the dotnet version installed by the script is latest and expect certain versions of SDK that
# have not published yet. As a result, we hit errors of "dotnet restore". As a workaround, hard code the
# working version until we move to ".NET 8" in the script.
run_command( run_command(
get_python_name() + [dotnet_install_script, "install", "--architecture", arch, "--install-dir", get_python_name() + [dotnet_install_script, "install", "--dotnet-versions", "7.0.100-rc.2.22458.3", "--architecture", arch, "--install-dir",
dotnet_directory, "--verbose"]) dotnet_directory, "--verbose"])
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册