Skip to content

[ci] Fix macOS hosted image label on internal pipeline #12005

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

Merged
jonathanpeppers merged 2 commits into from
Jul 8, 2026
+14 −4
Merged

[ci] Fix macOS hosted image label on internal pipeline #12005

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1874da3
[ci] Fix macOS hosted image label on internal pipeline
jonathanpeppers Jul 7, 2026
551b592
[ci] Detect NativeAOT RID by agent arch in Java.Interop Mac lane
jonathanpeppers Jul 7, 2026
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
2 changes: 0 additions & 2 deletions build-tools/automation/azure-pipelines-public.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,6 @@ variables:
- name: DefaultJavaSdkMajorVersion
value: 21
# Override pool images for public Microsoft-hosted agents
Comment thread
jonathanpeppers marked this conversation as resolved.
- name: HostedMacImage
value: macOS-15
- name: LinuxPoolImage
value: ubuntu-22.04
- name: NetCorePublicPoolName
Expand Down
14 changes: 13 additions & 1 deletion build-tools/automation/yaml-templates/stage-java-interop-tests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,14 +104,26 @@ stages:
fi
displayName: Ensure cmake is installed

# The hosted macOS pool architecture can change between Intel (osx-x64) and
# Apple Silicon (osx-arm64), so detect it at runtime and publish/run the
# NativeAOT sample for the matching RID. Otherwise the produced .dylib fails
# to dlopen with an "incompatible architecture" error.
- bash: |
if [ "$(Agent.OSArchitecture)" = "ARM64" ]; then
echo "##vso[task.setvariable variable=NativeAOTRid]osx-arm64"
else
echo "##vso[task.setvariable variable=NativeAOTRid]osx-x64"
fi
displayName: Determine NativeAOT RID

- template: /external/Java.Interop/build-tools/automation/templates/install-dependencies.yaml@self

- template: /external/Java.Interop/build-tools/automation/templates/core-build.yaml@self

- template: /external/Java.Interop/build-tools/automation/templates/core-tests.yaml@self
parameters:
runNativeTests: true
nativeAotRid: osx-arm64
nativeAotRid: $(NativeAOTRid)
platformName: .NET - MacOS

- template: /external/Java.Interop/build-tools/automation/templates/fail-on-dirty-tree.yaml@self
Expand Down
2 changes: 1 addition & 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 @@ -30,7 +30,7 @@ variables:
- name: GitHub.Token
value: $(github--pat--vs-mobiletools-engineering-service2)
- name: HostedMacImage
value: macOS-15-arm64
value: macOS-15
Comment thread
jonathanpeppers marked this conversation as resolved.
- name: HostedMacImageWithEmulator
value: macOS-15
- name: SharedMacPool
Expand Down