Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
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
25 changes: 25 additions & 0 deletions eng/pipelines/common/templates/runtimes/xplat-job.yml
Original file line number Diff line number Diff line change
Expand Up @@ -109,4 +109,29 @@ jobs:
fetchDepth: $(checkoutFetchDepth)
fetchTags: false

- ${{ if and(eq(parameters.isOfficialBuild, true), notin(parameters.osGroup, 'osx', 'maccatalyst', 'ios', 'iossimulator', 'tvos', 'tvossimulator')) }}:
- template: /eng/pipelines/common/restore-internal-tools.yml

- ${{ if ne(variables['System.TeamProject'], 'public') }}:
- ${{ if and(ne(parameters.osGroup, 'windows'), ne(parameters.hostedOs, 'windows')) }}:
- task: Bash@3
displayName: Setup Private Feeds Credentials
inputs:
filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh
arguments: $(Build.SourcesDirectory)/NuGet.config $Token
env:
Token: $(dn-bot-dnceng-artifact-feeds-rw)
- ${{ else }}:
- task: PowerShell@2
displayName: Setup Private Feeds Credentials
inputs:
filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1
arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token
env:
Token: $(dn-bot-dnceng-artifact-feeds-rw)
# Run the NuGetAuthenticate task after the internal feeds are added to the nuget.config
# This ensures that creds are set appropriately for all feeds in the config, and that the
# credential provider is installed.
- task: NuGetAuthenticate@1

- ${{ parameters.steps }}
35 changes: 28 additions & 7 deletions eng/pipelines/coreclr/templates/helix-queues-setup.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,31 +34,52 @@ jobs:

# iOS Simulator/Mac Catalyst arm64
- ${{ if in(parameters.platform, 'iossimulator_arm64', 'tvossimulator_arm64', 'maccatalyst_arm64') }}:
- OSX.15.Arm64.Open
- ${{ if eq(variables['System.TeamProject'], 'public') }}:
- OSX.15.Arm64.Open
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
- OSX.15.Arm64

# iOS/tvOS Simulator x64 & MacCatalyst x64
- ${{ if in(parameters.platform, 'iossimulator_x64', 'tvossimulator_x64', 'maccatalyst_x64') }}:
- OSX.15.Amd64.Open
- ${{ if eq(variables['System.TeamProject'], 'public') }}:
- OSX.15.Amd64.Open
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
- OSX.15.Amd64

# Android arm64
- ${{ if in(parameters.platform, 'android_arm64') }}:
- Windows.11.Amd64.Android.Open
- ${{ if eq(variables['System.TeamProject'], 'public') }}:
- Windows.11.Amd64.Android.Open
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
- Windows.11.Amd64.Android

# Android x64
- ${{ if in(parameters.platform, 'android_x64') }}:
- Ubuntu.2204.Amd64.Android.29.Open
- ${{ if eq(variables['System.TeamProject'], 'public') }}:
- Ubuntu.2204.Amd64.Android.29.Open
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
- Ubuntu.2204.Amd64.Android.29

# Browser wasm
- ${{ if eq(parameters.platform, 'browser_wasm') }}:
- (Ubuntu.2404.Amd64)[email protected]/dotnet-buildtools/prereqs:ubuntu-24.04-helix-webassembly-amd64
- ${{ if eq(variables['System.TeamProject'], 'public') }}:
- (Ubuntu.2404.Amd64)[email protected]/dotnet-buildtools/prereqs:ubuntu-24.04-helix-webassembly-amd64
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
- (Ubuntu.2404.Amd64)[email protected]/dotnet-buildtools/prereqs:ubuntu-24.04-helix-webassembly-amd64

# iOS devices
- ${{ if in(parameters.platform, 'ios_arm64') }}:
- osx.15.amd64.iphone.open
- ${{ if eq(variables['System.TeamProject'], 'public') }}:
- osx.15.amd64.iphone.open
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
- osx.15.amd64.iphone

# tvOS devices
- ${{ if in(parameters.platform, 'tvos_arm64') }}:
- osx.15.amd64.appletv.open
- ${{ if eq(variables['System.TeamProject'], 'public') }}:
- osx.15.amd64.appletv.open
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
- osx.15.amd64.appletv

# Linux arm
- ${{ if eq(parameters.platform, 'linux_arm') }}:
Expand Down
6 changes: 4 additions & 2 deletions eng/pipelines/libraries/helix-queues-setup.yml
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,11 @@ jobs:
- $(helix_macos_x64)

# Android
- ${{ if in(parameters.platform, 'android_x86', 'android_x64', 'linux_bionic_x64') }}:
# Always use the Ubuntu-based Android queue for internal validation as there is no internal equivalent of
# the Windows.11.Amd64.Android.Open queue.
- ${{ if or(eq(variables['System.TeamProject'], 'internal'), in(parameters.platform, 'android_x86', 'android_x64', 'linux_bionic_x64')) }}:
- Ubuntu.2204.Amd64.Android.29.Open
- ${{ if in(parameters.platform, 'android_arm', 'android_arm64', 'linux_bionic_arm', 'linux_bionic_arm64') }}:
- ${{ if and(eq(variables['System.TeamProject'], 'public'), in(parameters.platform, 'android_arm', 'android_arm64', 'linux_bionic_arm', 'linux_bionic_arm64')) }}:
- Windows.11.Amd64.Android.Open

# iOS Simulator/Mac Catalyst arm64
Expand Down
Loading