Enable superpmi-collect pipeline on macOS arm64 #63691
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -22,12 +22,12 @@ | |
| # 4. Lastly, it sets the pipeline variables. | ||
| # | ||
| # Below are the helix queues it sets depending on the OS/architecture: | ||
| # | Arch | windows | Linux | macOS | | ||
| # |-------|-------------------------|--------------------------------------------------------------------------------------------------------------------------------------|----------------| | ||
| # | x86 | Windows.10.Amd64.X86.Rt | | - | | ||
| # | x64 | Windows.10.Amd64.X86.Rt | Ubuntu.1804.Amd64 | OSX.1014.Amd64 | | ||
| # | arm | - | (Ubuntu.1804.Arm32)[email protected]/dotnet-buildtools/prereqs:ubuntu-18.04-helix-arm32v7-bfcd90a-20200121150440 | - | | ||
| # | arm64 | Windows.10.Arm64 | (Ubuntu.1804.Arm64)[email protected]/dotnet-buildtools/prereqs:ubuntu-18.04-helix-arm64v8-20210531091519-97d8652 | OSX.1100.ARM64 | | ||
| # | ||
| ################################################################################ | ||
| ################################################################################ | ||
|
|
@@ -47,6 +47,7 @@ | |
| parser.add_argument("-source_directory", help="path to source directory") | ||
| parser.add_argument("-core_root_directory", help="path to core_root directory") | ||
| parser.add_argument("-arch", help="Architecture") | ||
| parser.add_argument("-platform", help="OS platform") | ||
| parser.add_argument("-mch_file_tag", help="Tag to be used to mch files") | ||
| parser.add_argument("-collection_name", help="Name of the SPMI collection to be done (e.g., libraries, tests)") | ||
| parser.add_argument("-collection_type", help="Type of the SPMI collection to be done (crossgen, crossgen2, pmi)") | ||
|
|
@@ -196,6 +197,11 @@ def setup_args(args): | |
| lambda unused: True, | ||
| "Unable to set arch") | ||
|
|
||
| coreclr_args.verify(args, | ||
| "platform", | ||
| lambda unused: True, | ||
| "Unable to set platform") | ||
|
|
||
| coreclr_args.verify(args, | ||
| "mch_file_tag", | ||
| lambda unused: True, | ||
|
|
@@ -383,28 +389,33 @@ def main(main_args): | |
| superpmi_src_directory = os.path.join(source_directory, 'src', 'coreclr', 'scripts') | ||
| superpmi_dst_directory = os.path.join(correlation_payload_directory, "superpmi") | ||
| arch = coreclr_args.arch | ||
| platform_name = coreclr_args.platform.lower() | ||
| helix_source_prefix = "official" | ||
| creator = "" | ||
| ci = True | ||
| if platform_name == "windows": | ||
| helix_queue = "Windows.10.Arm64" if arch == "arm64" else "Windows.10.Amd64.X86.Rt" | ||
| elif platform_name == "linux": | ||
| if arch == "arm": | ||
| helix_queue = "(Ubuntu.1804.Arm32)[email protected]/dotnet-buildtools/prereqs:ubuntu-18.04-helix-arm32v7-bfcd90a-20200121150440" | ||
| elif arch == "arm64": | ||
| helix_queue = "(Ubuntu.1804.Arm64)[email protected]/dotnet-buildtools/prereqs:ubuntu-18.04-helix-arm64v8-20210531091519-97d8652" | ||
| else: | ||
| helix_queue = "Ubuntu.1804.Amd64" | ||
| elif platform_name == "osx": | ||
|
Contributor
There was a problem hiding this comment. can you also update the comments at the top of the file? |
||
| helix_queue = "OSX.1100.ARM64" if arch == "arm64" else "OSX.1014.Amd64" | ||
|
Contributor
There was a problem hiding this comment. You do have helix queue for
Contributor
Author
There was a problem hiding this comment. Yes, I don't think the macOS/x64 and Linux/x64 collections will be that different. I added |
||
|
|
||
| # create superpmi directory | ||
| print('Copying {} -> {}'.format(superpmi_src_directory, superpmi_dst_directory)) | ||
| copy_directory(superpmi_src_directory, superpmi_dst_directory, verbose_output=True, match_func=lambda path: any(path.endswith(extension) for extension in [".py"])) | ||
|
|
||
| if platform_name == "windows": | ||
|
Contributor
There was a problem hiding this comment. nit: This can continue to be
Contributor
Author
There was a problem hiding this comment. Well, it could.
Contributor
Author
There was a problem hiding this comment. Decided to leave this as is for the reason I described. |
||
| acceptable_copy = lambda path: any(path.endswith(extension) for extension in [".py", ".dll", ".exe", ".json"]) | ||
| else: | ||
| acceptable_extensions = [".py", ".dll", ".json"] | ||
| acceptable_extensions.append(".so" if platform_name == "linux" else ".dylib") | ||
| # Need to accept files without any extension, which is how executable file's names look. | ||
| acceptable_copy = lambda path: (os.path.basename(path).find(".") == -1) or any(path.endswith(extension) for extension in acceptable_extensions) | ||
|
|
||
| print('Copying {} -> {}'.format(coreclr_args.core_root_directory, superpmi_dst_directory)) | ||
| copy_directory(coreclr_args.core_root_directory, superpmi_dst_directory, verbose_output=True, match_func=acceptable_copy) | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.