Changeset 9897

Timestamp:

05/22/2020 04:27:29 AM (5 years ago)

Author:

dd32

Message:

Trac: When pulling GitHub PR status, check the Test Runners results directly to avoid misleading/incorrect/missing PR statuses.

Merges ​https://github.com/WordPress/wordpress.org/pull/5
See #4903.

Location:

sites/trunk

Files:

• api.wordpress.org/public_html/dotorg/trac/pr/functions.php (modified) (2 diffs)
• api.wordpress.org/public_html/dotorg/trac/pr/index.php (modified) (1 diff)
• wordpress.org/public_html/style/trac/wp-trac.js (modified) (2 diffs)

sites/trunk/api.wordpress.org/public_html/dotorg/trac/pr/functions.php

@@ -12 +12 @@
     if ( ! $data || ! $data->number ) {
         return false;
+    }
+
+    // Get Travis CI State.
+    $check_runs = [];
+    $raw_check_runs = api_request(
+        '/repos/' . $repo . '/commits/' . $data->head->sha . '/check-runs',
+        null,
+        [ 'Accept: application/vnd.github.antiope-preview+json' ]
+    );
+    if ( !empty( $raw_check_runs->check_runs ) ) {
+        foreach ( $raw_check_runs->check_runs as $check ) {
+            switch ( $check->status ) {
+                case 'queued':
+                case 'in_progress':
+                    $check_runs[ $check->app->name ] = 'in_progress';
+                    break;
+                case 'completed':
+                    switch( $check->conclusion ) {
+                        case 'success':
+                            $check_runs[ $check->app->name ] = 'success';
+                            break;
+                        case 'failure':
+                            $check_runs[ $check->app->name ] = 'failed';
+                            break;
+                        case 'action_required':
+                            $check_runs[ $check->app->name ] = $check->output->title;
+                            break;
+                    }
+            }
+        }
     }
 
@@ -24 +54 @@
         'closed_at'       => $data->closed_at,
         'mergeable_state' => $data->mergeable_state,
+        'check_runs'      => $check_runs,
         'body'            => $data->body,
         'user'            => (object) [

sites/trunk/api.wordpress.org/public_html/dotorg/trac/pr/index.php

@@ -52 +52 @@
             &&
             strtotime( $data->last_checked_at ) <= time() - 2*60
+        ) ||
+        // or unit tests are running, then 2min.
+        (
+            $data->check_runs
+            &&
+            in_array( 'in_progress', $data->check_runs )
+            &&
+            strtotime( $data->last_checked_at ) <= time() - 2*60
         )
     ) {

sites/trunk/wordpress.org/public_html/style/trac/wp-trac.js

@@ -1700 +1700 @@
                 // Closed?
                 if ( data.closed_at ) {
-                    if ( data.mergeable_state == 'clean' ) {
-                        return '✅ Closed';
-                    } else {
-                        return '❌ Closed'
+                    return '✅ Closed';
+                }
+
+                // Unit Tests?
+                if ( data.check_runs ) {
+                    for ( var provider in data.check_runs ) {
+                        switch( data.check_runs[ provider ] ) {
+                            case 'in_progress':
+                                return provider + ' running';
+                            case 'failed':
+                                return '❌ ' + provider + ' failed';
+                            case 'success':
+                                continue;
+                            default:
+                                return '❌ ' + provider + ' ' + data.check_runs[ provider ];
+                        }
                     }
                 }
@@ -1710 +1722 @@
                 switch ( data.mergeable_state ) {
                     case 'draft':
-                        return 'Work in progress';
+                        return 'Draft';
+                    case 'blocked': // This seems to be returned for our App with PRs but not others..
                     case 'clean':
                         return '✅ All checks pass';
                     case 'dirty':
                         return '❌ Merge conflicts';
-                    case 'unstable':
+                    case 'unstable': // Not seen, Unit Tests above should catch it.
                         return '❌ Failing tests';
+                    case 'unknown':
+                        return 'Unknown';
                 }
             }