Skip to content
New issue

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

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

Already on GitHub? # to your account

Fix libraries outerloop pipelines #79652

Merged
merged 7 commits into from
Dec 14, 2022
Merged

Fix libraries outerloop pipelines #79652

merged 7 commits into from
Dec 14, 2022

Conversation

ViktorHofer
Copy link
Member

Fixes #76755

@ghost
Copy link

ghost commented Dec 14, 2022

Tagging subscribers to this area: @dotnet/area-infrastructure-libraries
See info in area-owners.md if you want to be subscribed.

Issue Details

Fixes #76755

Author: ViktorHofer
Assignees: ViktorHofer
Labels:

area-Infrastructure-libraries

Milestone: -

@ViktorHofer
Copy link
Member Author

@ViktorHofer
Copy link
Member Author

/azp help

@azure-pipelines
Copy link

Supported commands
  • help:
    • Get descriptions, examples and documentation about supported commands
    • Example: help "command_name"
  • list:
    • List all pipelines for this repository using a comment.
    • Example: "list"
  • run:
    • Run all pipelines or specific pipelines for this repository using a comment. Use this command by itself to trigger all related pipelines, or specify specific pipelines to run.
    • Example: "run" or "run pipeline_name, pipeline_name, pipeline_name"
  • where:
    • Report back the Azure DevOps orgs that are related to this repository and org
    • Example: "where"

See additional documentation.

@ViktorHofer
Copy link
Member Author

/azp list

@azure-pipelines
Copy link

CI/CD Pipelines for this repository:

@ViktorHofer
Copy link
Member Author

/azp run runtime-libraries-coreclr outerloop

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@ViktorHofer
Copy link
Member Author

@ViktorHofer
Copy link
Member Author

@ViktorHofer
Copy link
Member Author

/azp run runtime-libraries-coreclr outerloop

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@ViktorHofer ViktorHofer marked this pull request as ready for review December 14, 2022 18:30
@ViktorHofer ViktorHofer merged commit 8e29ce7 into main Dec 14, 2022
@ViktorHofer ViktorHofer deleted the ViktorHofer-outerloop-fix branch December 14, 2022 18:30
@ghost ghost locked as resolved and limited conversation to collaborators Jan 13, 2023
@akoeplinger
Copy link
Member

akoeplinger commented Nov 20, 2023

/backport to release/7.0-staging (trying to fix #87287)

@github-actions github-actions bot unlocked this conversation Nov 20, 2023
Copy link
Contributor

Started backporting to release/7.0-staging: https://github.com/dotnet/runtime/actions/runs/6931282173

Copy link
Contributor

@akoeplinger backporting to release/7.0-staging failed, the patch most likely resulted in conflicts:

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

Applying: Fix libraries outerloop pipelines
Using index info to reconstruct a base tree...
M	eng/pipelines/libraries/outerloop.yml
Falling back to patching base and 3-way merge...
Auto-merging eng/pipelines/libraries/outerloop.yml
CONFLICT (content): Merge conflict in eng/pipelines/libraries/outerloop.yml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Fix libraries outerloop pipelines
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128

Please backport manually!

Copy link
Contributor

@akoeplinger an error occurred while backporting to release/7.0-staging, please check the run log for details!

Error: git am failed, most likely due to a merge conflict.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Nov 20, 2023
# for free to subscribe to this conversation on GitHub. Already have an account? #.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

outerloop legs failing to detect dotnet
2 participants