Changeset 53350

Timestamp:

05/04/2022 11:42:42 AM (4 years ago)

Author:

SergeyBiryukov

Message:

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

This ensures that WP_UnitTestCase::skipOnAutomatedBranches() has access to the GITHUB_REF and GITHUB_EVENT_NAME variables, so that some tests can be skipped when appropriate.

Additionally, account for renaming the master branch to trunk in November 2021.

Follow-up to [40241], [46999], [49264], [49267], [51868].

Merges [53349] to the 6.0 branch.
Fixes #55668.

Location:

branches/6.0

Files:

• . (modified) (1 prop)
• docker-compose.yml (modified) (1 diff)
• tests/phpunit/includes/abstract-testcase.php (modified) (2 diffs)
• tests/phpunit/tests/basic.php (modified) (2 diffs)
• tests/phpunit/tests/external-http/basic.php (modified) (3 diffs)
• tests/phpunit/tests/theme.php (modified) (1 diff)

branches/6.0/docker-compose.yml

@@ -42 +42 @@
       - PHP_FPM_UID=${PHP_FPM_UID-1000}
       - PHP_FPM_GID=${PHP_FPM_GID-1000}
+      - GITHUB_REF=${GITHUB_REF-false}
+      - GITHUB_EVENT_NAME=${GITHUB_EVENT_NAME-false}
 
     volumes:

branches/6.0/tests/phpunit/includes/abstract-testcase.php

@@ -203 +203 @@
      * Allows tests to be skipped on some automated runs.
      *
-     * For test runs on GitHub Actions for something other than trunk/master,
-     * we want to skip tests that only need to run for master.
+     * For test runs on GitHub Actions for something other than trunk,
+     * we want to skip tests that only need to run for trunk.
      */
     public function skipOnAutomatedBranches() {
@@ -211 +211 @@
         $github_ref        = getenv( 'GITHUB_REF' );
 
-        if ( $github_event_name && 'false' !== $github_event_name ) {
+        if ( $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' );
+            if ( in_array( $github_event_name, $skipped, true ) || 'refs/heads/trunk' !== $github_ref ) {
+                $this->markTestSkipped( 'For automated test runs, this test is only run on trunk' );
             }
         }

branches/6.0/tests/phpunit/tests/basic.php

@@ -9 +9 @@
 
     public function test_license() {
-        // This test is designed to only run on trunk/master.
+        // This test is designed to only run on trunk.
         $this->skipOnAutomatedBranches();
 
@@ -19 +19 @@
 
     public function test_security_md() {
-        // This test is designed to only run on trunk/master.
+        // This test is designed to only run on trunk.
         $this->skipOnAutomatedBranches();
 

branches/6.0/tests/phpunit/tests/external-http/basic.php

@@ -11 +11 @@
      */
     public function test_readme_php_version() {
-        // This test is designed to only run on trunk/master.
+        // This test is designed to only run on trunk.
         $this->skipOnAutomatedBranches();
 
@@ -32 +32 @@
      */
     public function test_readme_mysql_version() {
-        // This test is designed to only run on trunk/master.
+        // This test is designed to only run on trunk.
         $this->skipOnAutomatedBranches();
 
@@ -64 +64 @@
      */
     public function test_readme_mariadb_version() {
-        // This test is designed to only run on trunk/master.
+        // This test is designed to only run on trunk.
         $this->skipOnAutomatedBranches();
 

branches/6.0/tests/phpunit/tests/theme.php

@@ -214 +214 @@
      */
     public function test_year_in_readme() {
-        // This test is designed to only run on trunk/master.
+        // This test is designed to only run on trunk.
         $this->skipOnAutomatedBranches();