Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 04:30:10 +01:00
Code Issues Projects Releases Packages Wiki Activity

WPT upstreamer: Make all failed merge operations leave a comment. (#37949)

Browse source 
The WPT exporter currently assumes that removing a label from a github
PR will never fail. This is obviously false and the result is a silent
failure. By moving the operation inside the existing try block we ensure
that a comment will be posted if any part of the merge step fails.

Testing: Untested; did not feel worth the time investment to determine
if the existing test harness can mock this particular situation.
Fixes: #37914

Signed-off-by: Josh Matthews <josh@joshmatthews.net>
This commit is contained in:
Josh Matthews 2025-07-09 13:43:15 -04:00 • committed by GitHub
parent 436c9072c4
commit 9b05d36cea
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
python/wpt/exporter/step.py
View file

@ -228,9 +228,9 @@ class MergePRStep(Step):
self.labels_to_remove = labels_to_remove self.labels_to_remove = labels_to_remove
def run(self, run: SyncRun): def run(self, run: SyncRun):
for label in self.labels_to_remove:
self.pull_request.remove_label(label)
try: try:
for label in self.labels_to_remove:
self.pull_request.remove_label(label)
self.pull_request.merge() self.pull_request.merge()
except Exception as exception: except Exception as exception:
logging.warning("Could not merge PR (%s).", self.pull_request) logging.warning("Could not merge PR (%s).", self.pull_request)