Skip to content
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.

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

Remove cleanup for CI Builds #20395

Merged
merged 33 commits into from Feb 12, 2024
Merged

Conversation

PureWeen
Copy link
Member

@PureWeen PureWeen commented Feb 6, 2024

@PureWeen PureWeen changed the base branch from main to release/8.0.1xx-sr2 February 7, 2024 07:28
@PureWeen PureWeen marked this pull request as ready for review February 7, 2024 07:29
@PureWeen PureWeen requested a review from a team as a code owner February 7, 2024 07:29
@PureWeen PureWeen requested review from StephaneDelcroix, tj-devel709, mattleibow and rmarinho and removed request for a team, StephaneDelcroix and tj-devel709 February 7, 2024 07:29
@Eilon Eilon added the area/infrastructure 🏗️ CI, Maestro / Coherency label Feb 7, 2024
@rmarinho rmarinho merged commit a195e8d into release/8.0.1xx-sr2 Feb 12, 2024
6 checks passed
@rmarinho rmarinho deleted the less_device_thrashing branch February 12, 2024 12:47
@rmarinho
Copy link
Member

/backport to main

Copy link
Contributor

Started backporting to main: https://github.com/dotnet/maui/actions/runs/7871967088

Copy link
Contributor

@rmarinho backporting to main failed, the patch most likely resulted in conflicts:

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

Applying: Remove cleanup for CI Builds
Applying: - added scripts
Applying: Update ios.cake
Applying: Update clean-bot.sh
Applying: add clean bot to yaml
Applying: - fix yml
Applying: - fix yaml
Applying: - try harder
Applying: - chmod
Applying: - update
Applying: - chmod
Applying: Update ios.cake
Applying: - add grep logging
error: sha1 information is lacking or useless (eng/pipelines/common/device-tests-steps.yml).
error: could not build fake ancestor
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0013 - add grep logging
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

@rmarinho an error occurred while backporting to main, please check the run log for details!

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

@github-actions github-actions bot locked and limited conversation to collaborators Mar 15, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
area/infrastructure 🏗️ CI, Maestro / Coherency
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[ci] Xharness fails to install application to run Device Tests and UITests
5 participants