Skip to content

[EWS] clean-up-git-repo step tries to delete invalid branches #16877

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 1 commit into from
Aug 21, 2023
Merged

[EWS] clean-up-git-repo step tries to delete invalid branches #16877

merged 1 commit into from
Aug 21, 2023

Conversation

@ddkilzer
Copy link
Contributor

@ddkilzer ddkilzer commented Aug 20, 2023 •
edited by webkit-early-warning-system
Loading

318e60f

[EWS] clean-up-git-repo step tries to delete invalid branches
https://bugs.webkit.org/show_bug.cgi?id=250623
<rdar://104512536>

Reviewed by Jonathan Bedard.

* Tools/CISupport/ews-build/steps.py:
(CleanGitRepo.run):
- Ignore 'HEAD detached at' line from `git branch` to fix the errors.
* Tools/CISupport/ews-build/steps_unittest.py:
- Update expected results in unit tests.

Canonical link: https://commits.webkit.org/267090@main

ea122cc

Misc iOS, tvOS & watchOS macOS Linux Windows
✅ 🧪 style ✅ 🛠 ios ✅ 🛠 mac ✅ 🛠 wpe ✅ 🛠 wincairo
✅ 🧪 bindings ✅ 🛠 ios-sim ✅ 🛠 mac-AS-debug ✅ 🧪 wpe-wk2
✅ 🧪 webkitperl ✅ 🧪 ios-wk2 ✅ 🧪 api-mac ✅ 🛠 gtk
✅ 🧪 ios-wk2-wpt ✅ 🧪 mac-wk1 ✅ 🧪 gtk-wk2
✅ 🧪 api-ios ✅ 🧪 mac-wk2 ✅ 🧪 api-gtk
✅ 🛠 tv ❌ 🧪 mac-AS-debug-wk2
✅ 🧪 services ✅ 🛠 tv-sim
✅ 🛠 watch
✅ 🛠 🧪 unsafe-merge ✅ 🛠 watch-sim

@ddkilzer ddkilzer self-assigned this Aug 20, 2023
@ddkilzer ddkilzer added the Tools / Tests Tools in the Tools directory, build issues, test infrastructure, and bugs in test cases label Aug 20, 2023
@webkit-early-warning-system
Copy link
Collaborator

webkit-early-warning-system commented Aug 20, 2023 •
edited
Loading

EWS run on current version of this PR (hash ea122cc)

Misc iOS, tvOS & watchOS macOS Linux Windows
✅ 🧪 style ✅ 🛠 ios ✅ 🛠 mac ✅ 🛠 wpe ✅ 🛠 wincairo
✅ 🧪 bindings ✅ 🛠 ios-sim ✅ 🛠 mac-AS-debug ✅ 🧪 wpe-wk2
✅ 🧪 webkitperl ✅ 🧪 ios-wk2 ✅ 🧪 api-mac ✅ 🛠 gtk
✅ 🧪 ios-wk2-wpt ✅ 🧪 mac-wk1 ✅ 🧪 gtk-wk2
✅ 🧪 api-ios ✅ 🧪 mac-wk2 ✅ 🧪 api-gtk
✅ 🛠 tv ❌ 🧪 mac-AS-debug-wk2
✅ 🧪 services ✅ 🛠 tv-sim
✅ 🛠 watch
✅ 🛠 🧪 unsafe-merge ✅ 🛠 watch-sim

@webkit-ews-buildbot webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Aug 20, 2023
@ddkilzer ddkilzer added unsafe-merge-queue Applied to send a pull request to merge-queue, but skip building and testing and removed merging-blocked Applied to prevent a change from being merged labels Aug 21, 2023
@ddkilzer
[EWS] clean-up-git-repo step tries to delete invalid branches
318e60f 
https://bugs.webkit.org/show_bug.cgi?id=250623
<rdar://104512536>

Reviewed by Jonathan Bedard.

* Tools/CISupport/ews-build/steps.py:
(CleanGitRepo.run):
- Ignore 'HEAD detached at' line from `git branch` to fix the errors.
* Tools/CISupport/ews-build/steps_unittest.py:
- Update expected results in unit tests.

Canonical link: https://commits.webkit.org/267090@main
@webkit-commit-queue webkit-commit-queue force-pushed the eng/EWS-clean-up-git-repo-step-tries-to-delete-invalid-branches branch from ea122cc to 318e60f Compare August 21, 2023 16:21
@webkit-commit-queue
Copy link
Collaborator

Committed 267090@main (318e60f): https://commits.webkit.org/267090@main

Reviewed commits have been landed. Closing PR #16877 and removing active labels.

@webkit-commit-queue webkit-commit-queue merged commit 318e60f into WebKit:main Aug 21, 2023
@webkit-commit-queue webkit-commit-queue removed the unsafe-merge-queue Applied to send a pull request to merge-queue, but skip building and testing label Aug 21, 2023
@ddkilzer ddkilzer deleted the eng/EWS-clean-up-git-repo-step-tries-to-delete-invalid-branches branch August 21, 2023 16:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@JonWBedard JonWBedard JonWBedard approved these changes

@aj062 aj062 Awaiting requested review from aj062 aj062 is a code owner

@ryanhaddad ryanhaddad Awaiting requested review from ryanhaddad ryanhaddad is a code owner

Assignees

@ddkilzer ddkilzer

Labels

Tools / Tests Tools in the Tools directory, build issues, test infrastructure, and bugs in test cases

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@ddkilzer @webkit-early-warning-system @webkit-commit-queue @JonWBedard @webkit-ews-buildbot