Changeset 49267

Timestamp:

10/21/2020 07:55:17 PM (4 years ago)

Author:

desrosj

Message:

Build/Test Tools: Pass GitHub Action related environment variables to the Docker container.

This ensures that WP_UnitTestCase::skipOnAutomatedBranches() has access to these variables so that time sensitive tests can be skipped when appropriate.

This also updates that logic to be more clear.

Follow up to [49264].

Props ocean90, johnbillion.
See #50401, #49050, #47767.

Location:

trunk

Files:

• docker-compose.yml (modified) (1 diff)
• tests/phpunit/includes/abstract-testcase.php (modified) (1 diff)

trunk/docker-compose.yml

@@ -111 +111 @@
       TRAVIS_BRANCH: ${TRAVIS_BRANCH-false}
       TRAVIS_PULL_REQUEST: ${TRAVIS_PULL_REQUEST-false}
+      GITHUB_REF: ${GITHUB_REF-false}
+      GITHUB_EVENT_NAME: ${GITHUB_EVENT_NAME-false}
 
     volumes:

trunk/tests/phpunit/includes/abstract-testcase.php

@@ -194 +194 @@
         $github_ref        = getenv( 'GITHUB_REF' );
 
-        if ( ( ! $travis_branch || ! $travis_pull_request ) && ! $github_event_name ) {
-            return;
-        }
-
-        if ( ( 'master' !== $travis_branch || 'false' !== $travis_pull_request ) && empty( $github_event_name ) ) {
-            $this->markTestSkipped( 'For automated test runs, this test is only run on trunk/master' );
-        } elseif ( in_array( $github_event_name, array( 'pull_request', 'pull_request_target' ), true ) || 'refs/heads/master' !== $github_ref ) {
-            $this->markTestSkipped( 'For automated test runs, this test is only run on trunk/master' );
+        if ( 'false' !== $github_event_name ) {
+            // We're on GitHub Actions.
+            $skipped = array( 'pull_request', 'pull_request_target' );
+
+            if ( in_array( $github_event_name, $skipped, true ) || 'refs/heads/master' !== $github_ref ) {
+                $this->markTestSkipped( 'For automated test runs, this test is only run on trunk/master - GitHub only' );
+            }
+        } elseif ( 'false' !== $travis_branch ) {
+            // We're on Travis CI.
+            if ( 'master' !== $travis_branch || 'false' !== $travis_pull_request ) {
+                $this->markTestSkipped( 'For automated test runs, this test is only run on trunk/master - Travis only' );
+            }
         }
     }