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

[housekeeping] Fix ps1 script warnings #25241

Merged
merged 3 commits into from
Oct 14, 2024
Merged

[housekeeping] Fix ps1 script warnings #25241

merged 3 commits into from
Oct 14, 2024

Conversation

@rmarinho rmarinho requested a review from a team as a code owner October 14, 2024 11:04
Redth
Redth previously approved these changes Oct 14, 2024
@rmarinho rmarinho merged commit 741e83e into main Oct 14, 2024
29 of 54 checks passed
@rmarinho rmarinho deleted the fix-scripts branch October 14, 2024 16:52
@rmarinho
Copy link
Member Author

/backport to release/9.0.1xx

Copy link
Contributor

Started backporting to release/9.0.1xx: https://github.com/dotnet/maui/actions/runs/11332648682

Copy link
Contributor

@rmarinho backporting to release/9.0.1xx failed, the patch most likely resulted in conflicts:

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

Applying: [housekeeping] Fix ps1 script warnings
Using index info to reconstruct a base tree...
M	eng/scripts/appium-install.ps1
Falling back to patching base and 3-way merge...
Auto-merging eng/scripts/appium-install.ps1
CONFLICT (content): Merge conflict in eng/scripts/appium-install.ps1
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 advice.mergeConflict false"
Patch failed at 0001 [housekeeping] Fix ps1 script warnings
Error: The process '/usr/bin/git' failed with exit code 128

Please backport manually!

Copy link
Contributor

@rmarinho an error occurred while backporting to release/9.0.1xx, please check the run log for details!

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

rmarinho added a commit that referenced this pull request Oct 14, 2024
* [housekeeping] Fix ps1 script warnings

* Fix upload tsa

* Try tsaoptions from artifact
# Conflicts:
#	eng/scripts/appium-install.ps1
@samhouts samhouts added the fixed-in-net8.0-nightly This may be available in a nightly release! label Oct 14, 2024
rmarinho added a commit that referenced this pull request Oct 15, 2024
* [housekeeping] Remove debug.keystore (#25240)

* [housekeeping] Fix ps1 script warnings (#25241)

* [housekeeping] Fix ps1 script warnings

* Fix upload tsa

* Try tsaoptions from artifact
# Conflicts:
#	eng/scripts/appium-install.ps1
@rmarinho
Copy link
Member Author

work related with #25492

@rmarinho rmarinho linked an issue Oct 24, 2024 that may be closed by this pull request
@github-actions github-actions bot locked and limited conversation to collaborators Nov 23, 2024
@samhouts samhouts added fixed-in-9.0.10 and removed fixed-in-net8.0-nightly This may be available in a nightly release! labels Dec 16, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[ci] Fix compliance errors
4 participants