Skip to content

Conversation

@rmarinho
Copy link
Member

Description of Change

backport changes on release pipelines

Copilot AI review requested due to automatic review settings October 29, 2025 11:48
Copy link
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull Request Overview

This PR backports changes to release pipelines to improve their configuration and flexibility. The changes focus on parameterizing pipeline settings and updating build configurations.

  • Adds new parameters for controlling microbuild and asset publishing behaviors
  • Updates Xcode version references and iOS simulator configurations
  • Modifies pipeline pool configurations and improves parameter flexibility

Reviewed Changes

Copilot reviewed 8 out of 8 changed files in this pull request and generated no comments.

Show a summary per file
File Description
eng/pipelines/common/variables.yml Adds XCODE variable and updates build definition conditions
eng/pipelines/common/localization.yml Updates pool configuration from HostedWinVS2019 to 1ESPTPool
eng/pipelines/arcade/stage-pack.yml Adds publishAssets and enableMicrobuild parameters with conditional logic
eng/pipelines/arcade/stage-integration-tests.yml Updates iOS test device version and comments out fail-on-issue template
eng/pipelines/arcade/stage-helix-tests.yml Adds multiple new parameters and removes hardcoded pool configuration
eng/pipelines/arcade/stage-device-tests.yml Adds publishAssets and enableMicrobuild parameters
eng/pipelines/arcade/stage-build.yml Adds publishAssets and enableMicrobuild parameters, removes default buildPlatforms
eng/pipelines/arcade/setup-test-env.yml Updates Xcode variable references from REQUIRED_XCODE to XCODE

@rmarinho
Copy link
Member Author

/backport to net10.0

@github-actions
Copy link
Contributor

Started backporting to net10.0 (link to workflow run)

@rmarinho rmarinho merged commit 9d881e9 into release/10.0.1xx Oct 29, 2025
4 checks passed
@rmarinho rmarinho deleted the last-fixes-dnceng branch October 29, 2025 11:49
@github-actions
Copy link
Contributor

@rmarinho backporting to net10.0 failed, the patch most likely resulted in conflicts. Please backport manually!

git am output
$ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch

Applying: [ci] Update pipelines
.git/rebase-apply/patch:174: trailing whitespace.
 
.git/rebase-apply/patch:205: trailing whitespace.
    
.git/rebase-apply/patch:205: new blank line at EOF.
+
warning: 3 lines add whitespace errors.
Using index info to reconstruct a base tree...
M	eng/pipelines/arcade/setup-test-env.yml
M	eng/pipelines/arcade/stage-build.yml
M	eng/pipelines/arcade/stage-device-tests.yml
M	eng/pipelines/arcade/stage-helix-tests.yml
M	eng/pipelines/arcade/stage-integration-tests.yml
M	eng/pipelines/arcade/stage-pack.yml
M	eng/pipelines/common/variables.yml
Falling back to patching base and 3-way merge...
Auto-merging eng/pipelines/arcade/setup-test-env.yml
CONFLICT (content): Merge conflict in eng/pipelines/arcade/setup-test-env.yml
Auto-merging eng/pipelines/common/variables.yml
CONFLICT (content): Merge conflict in eng/pipelines/common/variables.yml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0001 [ci] Update pipelines
Error: The process '/usr/bin/git' failed with exit code 128

Link to workflow output

@github-actions github-actions bot locked and limited conversation to collaborators Nov 29, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants