Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ci] Run Mac MSBuild tests on macos-14-arm64 #9665

Merged
merged 5 commits into from
Jan 15, 2025
Merged

[ci] Run Mac MSBuild tests on macos-14-arm64 #9665

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
98241a0
[ci] Run tests on `macos-14-arm64`
jpobst Jan 8, 2025
0699d1f
Emulator tests have to stay on Intel because arm64 images don't suppo…
jpobst Jan 9, 2025
f792b4e
Use `$(JAVA_HOME_17_arm64)` environment variable.
jpobst Jan 9, 2025
a29e99d
setup-jdk-variables ARM64 fix
jpobst Jan 10, 2025
7ca1e8a
Tweak parallelization.
jpobst Jan 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions build-tools/automation/yaml-templates/setup-jdk-variables.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
parameters:
jdkMajorVersion: $(DefaultJavaSdkMajorVersion)
useAgentJdkPath: true
jdkMajorVersion: $(DefaultJavaSdkMajorVersion) # Generally 11|17|21
useAgentJdkPath: true # true to use preinstalled agent JDK, false to use 'android-toolchain/jdk-NN'

steps:
- pwsh: |
$agentOS="$(Agent.OS)"
$agentArch="$(Agent.OSArchitecture)"
$agentArch="$(Agent.OSArchitecture)" -eq "ARM64" ? "arm64" : "$(Agent.OSArchitecture)"
$jdkMajorVersion="${{ parameters.jdkMajorVersion }}"
$xaPrepareJdkPath="$env:HOME/android-toolchain/jdk-$jdkMajorVersion"
if ("$agentOS" -eq "Windows_NT") {
Expand Down
4 changes: 2 additions & 2 deletions build-tools/automation/yaml-templates/stage-msbuild-emulator-tests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ stages:
displayName: "macOS > Tests > MSBuild+Emulator"
pool:
name: Azure Pipelines
vmImage: $(HostedMacImage)
vmImage: $(HostedMacImageWithEmulator)
os: macOS
timeoutInMinutes: 180
cancelTimeoutInMinutes: 5
Expand Down Expand Up @@ -89,7 +89,7 @@ stages:
deviceName: wear_square
pool:
name: Azure Pipelines
vmImage: $(HostedMacImage)
vmImage: $(HostedMacImageWithEmulator)
os: macOS
workspace:
clean: all
Expand Down
4 changes: 2 additions & 2 deletions build-tools/automation/yaml-templates/stage-msbuild-tests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ stages:
testOS: macOS
jobName: mac_msbuild_tests
jobDisplayName: macOS > Tests > MSBuild
agentCount: 14
agentCount: 10
xaSourcePath: ${{ parameters.xaSourcePath }}
repositoryAlias: ${{ parameters.repositoryAlias }}
commit: ${{ parameters.commit }}
Expand All @@ -34,7 +34,7 @@ stages:
testOS: Windows
jobName: win_msbuild_tests
jobDisplayName: Windows > Tests > MSBuild
agentCount: 6
agentCount: 8
xaSourcePath: ${{ parameters.xaSourcePath }}
repositoryAlias: ${{ parameters.repositoryAlias }}
commit: ${{ parameters.commit }}
Expand Down
4 changes: 2 additions & 2 deletions build-tools/automation/yaml-templates/stage-package-tests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ stages:
displayName: macOS > Tests > APKs 1
pool:
name: Azure Pipelines
vmImage: $(HostedMacImage)
vmImage: $(HostedMacImageWithEmulator)
os: macOS
timeoutInMinutes: 180
workspace:
Expand Down Expand Up @@ -120,7 +120,7 @@ stages:
displayName: macOS > Tests > APKs 2
pool:
name: Azure Pipelines
vmImage: $(HostedMacImage)
vmImage: $(HostedMacImageWithEmulator)
os: macOS
timeoutInMinutes: 180
workspace:
Expand Down
4 changes: 3 additions & 1 deletion build-tools/automation/yaml-templates/variables.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ variables:
- name: WindowsToolchainPdbArtifactName
value: windows-toolchain-pdb
- name: ApkDiffToolVersion
value: 0.0.15
value: 0.0.17
- name: TestSlicerToolVersion
value: 0.1.0-alpha7
- name: BootsToolVersion
Expand All @@ -30,6 +30,8 @@ variables:
- name: GitHub.Token
value: $(github--pat--vs-mobiletools-engineering-service2)
- name: HostedMacImage
value: macOS-14-arm64
- name: HostedMacImageWithEmulator
value: macOS-14
- name: SharedMacPool
value: VSEng-VSMac-Xamarin-Shared
Expand Down
Loading