Skip to content

Commit 9d881e9

Browse files
authored
[ci] Update pipelines (#32268)
1 parent 2a1ddfc commit 9d881e9

File tree

8 files changed

+58
-50
lines changed

8 files changed

+58
-50
lines changed

eng/pipelines/arcade/setup-test-env.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,13 @@ steps:
3737
xcrun xcode-select --print-path
3838
echo
3939
echo selecting latest xcode...
40-
sudo xcode-select -s /Applications/Xcode_$(REQUIRED_XCODE).app
40+
sudo xcode-select -s /Applications/Xcode_$(XCODE).app
4141
xcrun xcode-select --print-path
4242
xcodebuild -version
4343
sudo xcodebuild -license accept
4444
# if we're using Xcode 26.0[.?], then explicitly install the iOS 26.0 simulator (the iOS 26.0.1 simulator doesn't work for us)
4545
# also install the universal simulator version, so that this bot can run x64 apps in the simulator.
46-
if [[ "$(REQUIRED_XCODE)" =~ ^26[.]0.*$ ]]; then
46+
if [[ "$(XCODE)" =~ ^26[.]0.*$ ]]; then
4747
if ! sudo xcodebuild -downloadPlatform iOS -architectureVariant universal -buildVersion 26.0; then
4848
echo "Failed to install simulator runtime, deleting all simulator runtimes and trying again..."
4949
sudo xcrun simctl runtime delete all

eng/pipelines/arcade/stage-build.yml

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,15 @@ parameters:
1515
- name: sourceIndexParams
1616
type: object
1717
default: []
18-
- name: runAsPublic
18+
- name: publishAssets
19+
type: boolean
20+
default: false
21+
- name: enableMicrobuild
1922
type: boolean
2023
default: false
24+
- name: runAsPublic
25+
type: boolean
26+
default: true
2127
- name: buildProjects
2228
type: string
2329
default: '$(Build.SourcesDirectory)/Microsoft.Maui.sln'
@@ -34,17 +40,6 @@ parameters:
3440
- Release
3541
- name: buildPlatforms
3642
type: object
37-
default:
38-
- name: NetCore-Public
39-
image: 1es-windows-2022
40-
os: Windows
41-
buildScript: $(_buildScript)
42-
sln: $(buildProjects)
43-
- name: Azure Pipelines
44-
vmImage: $(HostedMacImage)
45-
os: macOS
46-
buildScript: $(_buildScriptMacOS)
47-
sln: $(buildProjectsMac)
4843

4944
stages:
5045
- stage: Build
@@ -56,9 +51,9 @@ stages:
5651
parameters:
5752
helixRepo: dotnet/maui
5853
pool: ${{ BuildPlatform }}
59-
enableMicrobuild: true
54+
enableMicrobuild: ${{ parameters.enableMicrobuild }}
6055
enablePublishUsingPipelines: true
61-
enablePublishBuildAssets: true
56+
enablePublishBuildAssets: ${{ parameters.publishAssets }}
6257
enableTelemetry: true
6358
enableSourceBuild: ${{ parameters.enableSourceBuild }}
6459
enableSourceIndex: ${{ parameters.enableSourceIndex }}

eng/pipelines/arcade/stage-device-tests.yml

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,12 @@ parameters:
1717
- name: sourceIndexParams
1818
type: object
1919
default: []
20+
- name: publishAssets
21+
type: boolean
22+
default: false
23+
- name: enableMicrobuild
24+
type: boolean
25+
default: false
2026
- name: runAsPublic
2127
type: boolean
2228
default: true
@@ -48,9 +54,9 @@ stages:
4854
parameters:
4955
helixRepo: dotnet/maui
5056
pool: ${{ parameters.pool }}
51-
enableMicrobuild: true
57+
enableMicrobuild: ${{ parameters.enableMicrobuild }}
5258
enablePublishUsingPipelines: true
53-
enablePublishBuildAssets: true
59+
enablePublishBuildAssets: ${{ parameters.publishAssets }}
5460
enableTelemetry: true
5561
enableSourceBuild: ${{ parameters.enableSourceBuild }}
5662
enableSourceIndex: ${{ parameters.enableSourceIndex }}
@@ -100,14 +106,14 @@ stages:
100106
pool: ${{ parameters.pool }}
101107
enableMicrobuild: false
102108
enablePublishUsingPipelines: true
103-
enablePublishBuildAssets: true
109+
enablePublishBuildAssets: ${{ parameters.publishAssets }}
104110
enableTelemetry: true
105111
enableSourceBuild: ${{ parameters.enableSourceBuild }}
106112
enableSourceIndex: ${{ parameters.enableSourceIndex }}
107113
sourceIndexParams: ${{ parameters.sourceIndexParams }}
108114
publishAssetsImmediately: true
109115
enablePublishBuildArtifacts: true
110-
enablePublishTestResults: false
116+
enablePublishTestResults: true
111117
workspace:
112118
clean: all
113119
jobs:

eng/pipelines/arcade/stage-helix-tests.yml

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,21 @@ parameters:
1515
- name: sourceIndexParams
1616
type: object
1717
default: []
18+
- name: publishAssets
19+
type: boolean
20+
default: false
21+
- name: enableMicrobuild
22+
type: boolean
23+
default: false
1824
- name: runAsPublic
1925
type: boolean
2026
default: true
27+
- name: helixInternal
28+
type: string
29+
default: ''
30+
- name: HelixAccessToken
31+
type: string
32+
default: ''
2133
- name: creator
2234
type: string
2335
default: 'maui'
@@ -35,20 +47,9 @@ parameters:
3547
default:
3648
- Debug
3749
- Release
38-
- name: buildPlatforms
50+
- name: helixPool
3951
type: object
40-
default:
41-
- name: NetCore-Public
42-
image: 1es-windows-2022
43-
os: Windows
44-
buildScript: $(_helixScript)
45-
sln: $(buildProjects)
46-
- name: Azure Pipelines
47-
vmImage: $(HostedMacImage)
48-
os: macOS
49-
buildScript: $(_helixScriptMacOS)
50-
sln: $(buildProjectsMac)
51-
52+
5253
stages:
5354
- stage: HelixTests
5455
displayName: Run Helix Unit Tests
@@ -58,13 +59,10 @@ stages:
5859
- template: ${{ iif(eq(parameters.runAsPublic, 'true'), '/eng/common/templates/jobs/jobs.yml@self', '/eng/common/templates-official/jobs/jobs.yml@self') }}
5960
parameters:
6061
helixRepo: dotnet/maui
61-
pool:
62-
name: NetCore-Public
63-
vmImage: 1es-windows-2022
64-
os: windows
65-
enableMicrobuild: true
62+
pool: ${{ parameters.helixPool }}
63+
enableMicrobuild: ${{ parameters.enableMicrobuild }}
6664
enablePublishUsingPipelines: true
67-
enablePublishBuildAssets: true
65+
enablePublishBuildAssets: ${{ parameters.publishAssets }}
6866
enableTelemetry: true
6967
enableSourceBuild: ${{ parameters.enableSourceBuild }}
7068
enableSourceIndex: ${{ parameters.enableSourceIndex }}
@@ -89,7 +87,9 @@ stages:
8987
- script: $(_buildScript) -restore -build -configuration ${{ BuildConfiguration }} -projects "${{ parameters.buildTaskProjects }}" /p:ArchiveTests=false /p:TreatWarningsAsErrors=$(TreatWarningsAsErrors) /bl:$(Build.Arcade.LogsPath)${{ BuildConfiguration }}/buildtasks.binlog $(_OfficialBuildIdArgs)
9088
displayName: 🛠️ Build BuildTasks
9189

92-
- script: $(_msbuildCommand) "${{ parameters.helixProject }}" -warnAsError 0 -restore /p:Configuration=${{ BuildConfiguration }} /p:TestRunNameSuffix="_${{ BuildConfiguration }}" /bl:$(Build.Arcade.LogsPath)${{ BuildConfiguration }}/helix_tests.binlog ${{ parameters.extraHelixArguments }}
90+
- script: $(_msbuildCommand) "${{ parameters.helixProject }}" -warnAsError 0 -restore /p:Configuration=${{ BuildConfiguration }} /p:HelixInternal="${{ parameters.helixInternal }}" /p:TestRunNameSuffix="_${{ BuildConfiguration }}" /bl:$(Build.Arcade.LogsPath)${{ BuildConfiguration }}/helix_tests.binlog ${{ parameters.extraHelixArguments }}
9391
displayName: Run Helix Tests
9492
env:
9593
SYSTEM_ACCESSTOKEN: $(System.AccessToken) # We need to set this env var to publish helix results to Azure Dev Ops
94+
HelixAccessToken: ${{ parameters.HelixAccessToken }}
95+

eng/pipelines/arcade/stage-integration-tests.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ stages:
3333
useExitCodeForErrors: true
3434
${{ if eq(job.testCategory, 'RunOniOS') }}:
3535
envVariables:
36-
IOS_TEST_DEVICE: ios-simulator-64_18.0
36+
IOS_TEST_DEVICE: ios-simulator-64_18.5
3737

3838
- task: PublishTestResults@2
3939
inputs:
@@ -47,5 +47,4 @@ stages:
4747
targetPath: ${{ parameters.repoLogPath }}
4848
artifact: Logs - Integration Tests ${{ job.testCategory }} ${{ job.pool.os }} $(System.JobAttempt)
4949
condition: always()
50-
51-
- template: /eng/pipelines/common/fail-on-issue.yml
50+
# - template: /eng/pipelines/common/fail-on-issue.yml

eng/pipelines/arcade/stage-pack.yml

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,12 @@ parameters:
1717
- name: sourceIndexParams
1818
type: object
1919
default: []
20+
- name: publishAssets
21+
type: boolean
22+
default: false
23+
- name: enableMicrobuild
24+
type: boolean
25+
default: false
2026
- name: runAsPublic
2127
type: boolean
2228
default: true
@@ -30,14 +36,14 @@ stages:
3036
parameters:
3137
helixRepo: dotnet/maui
3238
pool: ${{ parameters.pool }}
33-
enableMicrobuild: true
39+
enableMicrobuild: ${{ parameters.enableMicrobuild }}
3440
enablePublishUsingPipelines: true
35-
enablePublishBuildAssets: true
41+
enablePublishBuildAssets: ${{ parameters.publishAssets }}
3642
enableTelemetry: true
3743
enableSourceBuild: ${{ parameters.enableSourceBuild }}
3844
enableSourceIndex: ${{ parameters.enableSourceIndex }}
3945
sourceIndexParams: ${{ parameters.sourceIndexParams }}
40-
publishAssetsImmediately: false
46+
publishAssetsImmediately: true
4147
enablePublishBuildArtifacts: true
4248
enablePublishTestResults: false
4349
templateContext:
@@ -67,12 +73,12 @@ stages:
6773
${{ pair.key }}: ${{ pair.value }}
6874

6975
# Run on public pipeline
70-
- ${{ if parameters.runAsPublic }}:
76+
- ${{ if not(parameters.enableMicrobuild) }}:
7177
- script: $(_buildScript) -restore -pack -publish $(_PublishArgs) -configuration $(_BuildConfig) /bl:$(Build.Arcade.LogsPath)/$(_BuildConfig)/pack.binlog $(_OfficialBuildIdArgs)
7278
displayName: Pack & Publish
7379

7480
# Run on internal pipeline
75-
- ${{ if and(not(parameters.runAsPublic) , notin(variables['Build.Reason'], 'PullRequest')) }}:
81+
- ${{ if and(not(parameters.runAsPublic) , parameters.enableMicrobuild) }}:
7682
- script: $(_buildScript) -restore -pack -sign $(_SignArgs) -configuration $(_BuildConfig) /bl:$(Build.Arcade.LogsPath)/$(_BuildConfig)/pack.binlog $(_OfficialBuildIdArgs)
7783
displayName: Pack, Sign
7884

eng/pipelines/common/localization.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ stages:
1111
jobs:
1212
- job : generate_lci
1313
displayName: 'Process outgoing strings'
14-
pool: $(HostedWinVS2019)
14+
pool: $(1ESPTPool)
1515

1616
variables:
1717
- group: OneLocBuildVariables # Contains the CeapexPat and GithubPat

eng/pipelines/common/variables.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ variables:
1111
value: 26.0.0
1212
- name: DEVICETESTS_REQUIRED_XCODE
1313
value: 26.0.0
14+
- name: XCODE
15+
value: 26.0
1416
- name: POWERSHELL_VERSION
1517
value: 7.4.0
1618
# Localization variables
@@ -59,7 +61,7 @@ variables:
5961
- group: maui-provisionator # This is just needed for the provisionator
6062
- group: MAUI # This is the main MAUI variable group that contains secret for the apple certificate
6163

62-
- ${{ if or(eq(variables['System.TeamProject'], 'DevDiv'), eq(variables['Build.DefinitionName'], 'dotnet-maui')) }}:
64+
- ${{ if or(eq(variables['System.TeamProject'], 'DevDiv'), eq(variables['Build.DefinitionName'], 'dotnet-maui'), eq(variables['Build.DefinitionName'], 'dotnet-maui-build')) }}:
6365
- name: internalProvisioning
6466
value: true
6567
- ${{ if notin(variables['Build.Reason'], 'PullRequest') }}:

0 commit comments

Comments
 (0)