WordPress.org
Get WordPress

Make WordPress Core

Changeset 58625


Ignore:
Timestamp:
07/02/2024 07:23:50 PM (3 months ago)
Author:
desrosj
Message:

Build/Test Tools: Make use of new reusable workflows for 5.2.

This updates the 5.2 branch to utilize the new reusable workflows in trunk introduced in [58165].

This also includes backports for a some additional improvements and bug fixes that are necessary for the local development environment to continue working long term:

  • The image and platform properties for the mysql container have been updated to always prefer amd64 containers (#60822).
  • macos-13 is now pinned for MacOS jobs instead of macos-latest (#61340).
  • Migrating to Docker Compose V2 (#60901).
  • Removing the version property from docker-compose.yml (#59416).
  • Improvements to how artifacts and comments for Playground testing are generated.
  • Removing SVN related commands causing failures (#61216).
  • Updating the actions/github-scripts action to the latest version.
  • Cache the results of PHP_CodeSniffer runs (#49783).
  • Move the Memcached container into the Docker Compose config (#55700).
  • Improvements to the healthcheck command for the mysql container (#58867).
  • Skip some tests when not in the primary branch (#50401).

Merges [49264], [51673], [52179], [53552], [53895], [56464], [57918], [58157], [57124], [57125], [57249] to the 5.2 branch.

Props johnbillion, joemcgill, swissspidy, thelovekesh, narenin, mukesh27, JeffPaul, peterwilsoncc, zieladam, ockham, SergeyBiryukov, jorbin, Clorith, afragen, jrf.
See #49783, #58867, #61340, #60822, #61216, #60901, #61101, #59416, #59805, #61213.

Location:
branches/5.2
Files:
2 added
1 deleted
11 edited
1 moved

Legend:

Unmodified
Added
Removed

  • branches/5.2

  • branches/5.2/.github/workflows/coding-standards.yml

    r55523 r58625  
    4141  cancel-in-progress: true
    4242
     43# Disable permissions for all available scopes by default.
     44# Any needed permissions should be configured at the job level.
     45permissions: {}
     46
    4347jobs:
    4448  # Runs PHP coding standards checks.
    45   #
    46   # Violations are reported inline with annotations.
    47   #
    48   # Performs the following steps:
    49   # - Checks out the repository.
    50   # - Sets up PHP.
    51   # - Logs debug information.
    52   # - Installs Composer dependencies (use cache if possible).
    53   # - Make Composer packages available globally.
    54   # - Logs PHP_CodeSniffer debug information.
    55   # - Runs PHPCS on the full codebase with warnings suppressed.
    56   # - Runs PHPCS on the `tests` directory without warnings suppressed.
    5749  phpcs:
    5850    name: PHP coding standards
    59     runs-on: ubuntu-latest
    60     timeout-minutes: 20
     51    uses: WordPress/wordpress-develop/.github/workflows/reusable-coding-standards-php.yml@trunk
     52    permissions:
     53      contents: read
    6154    if: ${{ github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' }}
    62 
    63     steps:
    64       - name: Checkout repository
    65         uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
    66 
    67       - name: Set up PHP
    68         uses: shivammathur/setup-php@d30ad8b1843ace22e6698ab99bbafaa747b6bd0d # v2.24.0
    69         with:
    70           php-version: '7.3'
    71           coverage: none
    72           tools: composer, cs2pr
    73 
    74       - name: Log debug information
    75         run: |
    76           php --version
    77           composer --version
    78 
    79       - name: Install Composer dependencies
    80         uses: ramsey/composer-install@83af392bf5f031813d25e6fe4cd626cdba9a2df6 # v2.2.0
    81         with:
    82           composer-options: "--no-progress --no-ansi"
    83 
    84       - name: Make Composer packages available globally
    85         run: echo "${PWD}/vendor/bin" >> $GITHUB_PATH
    86 
    87       - name: Log PHPCS debug information
    88         run: phpcs -i
    89 
    90       - name: Run PHPCBF on all Core files
    91         run: phpcbf
     55    with:
     56      php-version: '7.3'
     57      old-branch: true
    9258
    9359  # Runs the JavaScript coding standards checks.
    94   #
    95   # JSHint violations are not currently reported inline with annotations.
    96   #
    97   # Performs the following steps:
    98   # - Checks out the repository.
    99   # - Logs debug information about the GitHub Action runner.
    100   # - Installs Node.js.
    101   # - Logs updated debug information.
    102   # _ Installs npm dependencies.
    103   # - Run the WordPress JSHint checks.
    10460  jshint:
    10561    name: JavaScript coding standards
    106     runs-on: ubuntu-latest
    107     timeout-minutes: 20
     62    uses: WordPress/wordpress-develop/.github/workflows/reusable-coding-standards-javascript.yml@trunk
     63    permissions:
     64      contents: read
    10865    if: ${{ github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' }}
    109     env:
    110       PUPPETEER_SKIP_CHROMIUM_DOWNLOAD: ${{ true }}
    111 
    112     steps:
    113       - name: Checkout repository
    114         uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
    115 
    116       - name: Log debug information
    117         run: |
    118           npm --version
    119           node --version
    120           git --version
    121           svn --version
    122 
    123       - name: Install Node.js
    124         uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3.6.0
    125         with:
    126           node-version-file: '.nvmrc'
    127           cache: npm
    128 
    129       - name: Log debug information
    130         run: |
    131           npm --version
    132           node --version
    133 
    134       - name: Install Dependencies
    135         run: npm ci
    136 
    137       - name: Run JSHint
    138         run: npm run grunt jshint
    13966
    14067  slack-notifications:
    14168    name: Slack Notifications
    14269    uses: WordPress/wordpress-develop/.github/workflows/slack-notifications.yml@trunk
     70    permissions:
     71      actions: read
     72      contents: read
    14373    needs: [ phpcs, jshint ]
    14474    if: ${{ github.repository == 'WordPress/wordpress-develop' && github.event_name != 'pull_request' && always() }}
    … …  
    15484    name: Failed workflow tasks
    15585    runs-on: ubuntu-latest
     86    permissions:
     87      actions: write
    15688    needs: [ phpcs, jshint, slack-notifications ]
    15789    if: |
    … …  
    16799    steps:
    168100      - name: Dispatch workflow run
    169         uses: actions/github-script@98814c53be79b1d30f795b907e553d8679345975 # v6.4.0
     101        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
    170102        with:
    171103          retries: 2

  • branches/5.2/.github/workflows/javascript-tests.yml

    r55523 r58625  
    3939  cancel-in-progress: true
    4040
     41# Disable permissions for all available scopes by default.
     42# Any needed permissions should be configured at the job level.
     43permissions: {}
     44
    4145jobs:
    4246  # Runs the QUnit tests for WordPress.
    43   #
    44   # Performs the following steps:
    45   # - Checks out the repository.
    46   # - Logs debug information about the GitHub Action runner.
    47   # - Installs Node.js.
    48   # - Logs updated debug information.
    49   # _ Installs npm dependencies.
    50   # - Run the WordPress QUnit tests.
    5147  test-js:
    5248    name: QUnit Tests
    53     runs-on: ubuntu-latest
    54     timeout-minutes: 20
     49    uses: WordPress/wordpress-develop/.github/workflows/reusable-javascript-tests.yml@trunk
     50    permissions:
     51      contents: read
    5552    if: ${{ github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' }}
    56 
    57     steps:
    58       - name: Checkout repository
    59         uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
    60 
    61       - name: Log debug information
    62         run: |
    63           npm --version
    64           node --version
    65           git --version
    66           svn --version
    67 
    68       - name: Set up Node.js
    69         uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3.6.0
    70         with:
    71           node-version-file: '.nvmrc'
    72           cache: npm
    73 
    74       - name: Log debug information
    75         run: |
    76           npm --version
    77           node --version
    78 
    79       - name: Install Dependencies
    80         run: npm ci
    81 
    82       - name: Run QUnit tests
    83         run: npm run grunt qunit:compiled
    8453
    8554  slack-notifications:
    8655    name: Slack Notifications
    8756    uses: WordPress/wordpress-develop/.github/workflows/slack-notifications.yml@trunk
     57    permissions:
     58      actions: read
     59      contents: read
    8860    needs: [ test-js ]
    8961    if: ${{ github.repository == 'WordPress/wordpress-develop' && github.event_name != 'pull_request' && always() }}
    … …  
    9971    name: Failed workflow tasks
    10072    runs-on: ubuntu-latest
     73    permissions:
     74      actions: write
    10175    needs: [ test-js, slack-notifications ]
    10276    if: |
    … …  
    11185    steps:
    11286      - name: Dispatch workflow run
    113         uses: actions/github-script@98814c53be79b1d30f795b907e553d8679345975 # v6.4.0
     87        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
    11488        with:
    11589          retries: 2

  • branches/5.2/.github/workflows/phpunit-tests.yml

    r55523 r58625  
    2727  cancel-in-progress: true
    2828
    29 env:
    30   PUPPETEER_SKIP_CHROMIUM_DOWNLOAD: ${{ true }}
    31   # Controls which npm script to use for running PHPUnit tests. Options ar `php` and `php-composer`.
    32   PHPUNIT_SCRIPT: php
    33   LOCAL_PHP_MEMCACHED: ${{ false }}
    34   SLOW_TESTS: 'external-http,media,restapi'
     29# Disable permissions for all available scopes by default.
     30# Any needed permissions should be configured at the job level.
     31permissions: {}
    3532
    3633jobs:
    37   # Runs the PHPUnit tests for WordPress.
    38   #
    39   # Performs the following steps:
    40   # - Sets environment variables.
    41   # - Sets up the environment variables needed for testing with memcached (if desired).
    42   # - Installs Node.js.
    43   # - Installs npm dependencies
    44   # - Configures caching for Composer.
    45   # - Installs Composer dependencies.
    46   # - Logs Docker debug information (about the Docker installation within the runner).
    47   # - Starts the WordPress Docker container.
    48   # - Starts the Memcached server after the Docker network has been created (if desired).
    49   # - Logs general debug information about the runner.
    50   # - Logs the running Docker containers.
    51   # - Logs debug information from inside the WordPress Docker container.
    52   # - Logs debug information about what's installed within the WordPress Docker containers.
    53   # - Install WordPress within the Docker container.
    54   # - Run the PHPUnit tests.
    55   # - Checks out the WordPress Test reporter repository.
    56   # - Reconnect the directory to the Git repository.
    57   # - Submit the test results to the WordPress.org host test results.
     34  # Creates PHPUnit test jobs.
    5835  test-php:
    59     name: ${{ matrix.php }}${{ matrix.multisite && ' multisite' || '' }}${{ matrix.split_slow && ' slow tests' || '' }}${{ matrix.memcached && ' with memcached' || '' }} on ${{ matrix.os }}
    60     runs-on: ${{ matrix.os }}
    61     timeout-minutes: 20
     36    name: PHP ${{ matrix.php }}
     37    uses: WordPress/wordpress-develop/.github/workflows/reusable-phpunit-tests-v2.yml@trunk
     38    permissions:
     39      contents: read
     40    secrets: inherit
    6241    if: ${{ github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' }}
    6342    strategy:
     43      fail-fast: false
    6444      matrix:
     45        os: [ ubuntu-latest ]
    6546        php: [ '5.6', '7.0', '7.1', '7.2', '7.3' ]
    66         os: [ ubuntu-latest ]
     47        multisite: [ false, true ]
     48        split_slow: [ false ]
    6749        memcached: [ false ]
    68         split_slow: [ false ]
    69         multisite: [ false, true ]
    7050        include:
    7151          # Additional "slow" jobs for PHP 5.6.
    72           - php: '5.6.20'
     52          - php: '5.6'
    7353            os: ubuntu-latest
    7454            memcached: false
    7555            multisite: false
    7656            split_slow: true
    77           - php: '5.6.20'
     57          - php: '5.6'
    7858            os: ubuntu-latest
    7959            memcached: false
    … …  
    8565            memcached: true
    8666            multisite: false
     67            split_slow: false
    8768          - php: '7.3'
    8869            os: ubuntu-latest
    8970            memcached: true
    9071            multisite: true
    91           # Report the results of the PHP 7.3 without memcached job.
    92           - php: '7.3'
    93             os: ubuntu-latest
    94             memcached: false
    95             multisite: false
    96             report: true
    97     env:
    98       LOCAL_PHP: ${{ matrix.php }}-fpm
    99       LOCAL_PHP_MEMCACHED: ${{ matrix.memcached }}
    100       PHPUNIT_CONFIG: ${{ matrix.multisite && 'tests/phpunit/multisite.xml' || 'phpunit.xml.dist' }}
    101 
    102     steps:
    103       - name: Configure environment variables
    104         run: |
    105           echo "PHP_FPM_UID=$(id -u)" >> $GITHUB_ENV
    106           echo "PHP_FPM_GID=$(id -g)" >> $GITHUB_ENV
    107 
    108       - name: Checkout repository
    109         uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
    110 
    111       - name: Install Node.js
    112         uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3.6.0
    113         with:
    114           node-version-file: '.nvmrc'
    115           cache: npm
    116 
    117 
    118       - name: Install npm dependencies
    119         run: npm ci
    120 
    121       - name: Get Composer cache directory
    122         id: composer-cache
    123         run: echo "composer_dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
    124 
    125       - name: Cache Composer dependencies
    126         uses: actions/cache@58c146cc91c5b9e778e71775dfe9bf1442ad9a12 # v3.2.3
    127         env:
    128           cache-name: cache-composer-dependencies
    129         with:
    130           path: ${{ steps.composer-cache.outputs.composer_dir }}
    131           key: ${{ runner.os }}-php-${{ matrix.php }}-composer-${{ hashFiles('**/composer.lock') }}
    132 
    133       - name: Install Composer dependencies
    134         run: |
    135           if [ ${{ env.LOCAL_PHP }} == '7.1-fpm' ]; then
    136             docker-compose run --rm php composer update
    137             git checkout -- composer.lock
    138           elif [[ ${{ env.LOCAL_PHP }} == '5.6.20-fpm' || ${{ env.LOCAL_PHP }} == '5.6-fpm' || ${{ env.LOCAL_PHP }} == '7.0-fpm' ]]; then
    139             docker-compose run --rm php composer require --dev phpunit/phpunit:"^5.7" --update-with-dependencies
    140             git checkout -- composer.lock composer.json
    141           else
    142             docker-compose run --rm php composer install
    143           fi
    144 
    145       - name: Docker debug information
    146         run: |
    147           docker -v
    148           docker-compose -v
    149 
    150       - name: Start Docker environment
    151         run: |
    152           npm run env:start
    153 
    154       # The memcached server needs to start after the Docker network has been set up with `npm run env:start`.
    155       - name: Start the Memcached server.
    156         if: ${{ matrix.memcached }}
    157         run: |
    158           cp tests/phpunit/includes/object-cache.php src/wp-content/object-cache.php
    159           docker run --name memcached --net $(basename "$PWD")_wpdevnet -d memcached
    160 
    161       - name: General debug information
    162         run: |
    163           npm --version
    164           node --version
    165           curl --version
    166           git --version
    167           svn --version
    168 
    169       - name: Log running Docker containers
    170         run: docker ps -a
    171 
    172       - name: WordPress Docker container debug information
    173         run: |
    174           docker-compose run --rm mysql mysql --version
    175           docker-compose run --rm php php --version
    176           docker-compose run --rm php php -m
    177           docker-compose run --rm php php -i
    178           docker-compose run --rm php locale -a
    179 
    180       - name: Install WordPress
    181         run: npm run env:install
    182 
    183       - name: Run slow PHPUnit tests
    184         if: ${{ matrix.split_slow }}
    185         run: npm run test:${{ env.PHPUNIT_SCRIPT }} -- --verbose -c ${{ env.PHPUNIT_CONFIG }} --group ${{ env.SLOW_TESTS }}
    186 
    187       - name: Run PHPUnit tests for single site excluding slow tests
    188         if: ${{ matrix.php < '7.0' && ! matrix.split_slow && ! matrix.multisite }}
    189         run: npm run test:${{ env.PHPUNIT_SCRIPT }} -- --verbose -c ${{ env.PHPUNIT_CONFIG }} --exclude-group ${{ env.SLOW_TESTS }},ajax,ms-files,ms-required
    190 
    191       - name: Run PHPUnit tests for Multisite excluding slow tests
    192         if: ${{ matrix.php < '7.0' && ! matrix.split_slow && matrix.multisite }}
    193         run: npm run test:${{ env.PHPUNIT_SCRIPT }} -- --verbose -c ${{ env.PHPUNIT_CONFIG }} --exclude-group ${{ env.SLOW_TESTS }},ajax,ms-files,ms-excluded,oembed-headers
    194 
    195       - name: Run PHPUnit tests
    196         if: ${{ matrix.php >= '7.0' }}
    197         run: npm run test:${{ env.PHPUNIT_SCRIPT }} -- --verbose -c ${{ env.PHPUNIT_CONFIG }}
    198 
    199       - name: Run AJAX tests
    200         if: ${{ ! matrix.split_slow && ! matrix.multisite }}
    201         run: npm run test:${{ env.PHPUNIT_SCRIPT }} -- --verbose -c ${{ env.PHPUNIT_CONFIG }} --group ajax
    202 
    203       - name: Run tests as a multisite install
    204         run: npm run test:${{ env.PHPUNIT_SCRIPT }} -- --verbose -c tests/phpunit/multisite.xml
    205 
    206       - name: Run ms-files tests as a multisite install
    207         if: ${{ matrix.multisite && ! matrix.split_slow }}
    208         run: npm run test:${{ env.PHPUNIT_SCRIPT }} -- --verbose -c tests/phpunit/multisite.xml --group ms-files
    209 
    210       - name: Run external HTTP tests
    211         if: ${{ ! matrix.multisite && ! matrix.split_slow }}
    212         run: npm run test:${{ env.PHPUNIT_SCRIPT }} -- --verbose -c phpunit.xml.dist --group external-http
    213 
    214       - name: Checkout the WordPress Test Reporter
    215         if: ${{ github.repository == 'WordPress/wordpress-develop' && github.ref == 'refs/heads/trunk' && matrix.report }}
    216         uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
    217         with:
    218           repository: 'WordPress/phpunit-test-runner'
    219           path: 'test-runner'
    220 
    221       - name: Submit test results to the WordPress.org host test results
    222         if: ${{ github.repository == 'WordPress/wordpress-develop' && github.ref == 'refs/heads/trunk' && matrix.report }}
    223         env:
    224           WPT_REPORT_API_KEY: "${{ secrets.WPT_REPORT_API_KEY }}"
    225         run: docker-compose run --rm -e WPT_REPORT_API_KEY -e WPT_PREPARE_DIR=/var/www -e WPT_TEST_DIR=/var/www php php test-runner/report.php
     72            split_slow: false
     73    with:
     74      os: ${{ matrix.os }}
     75      php: ${{ matrix.php }}
     76      multisite: ${{ matrix.multisite }}
     77      split_slow: ${{ matrix.split_slow }}
     78      test_ajax: ${{ ! matrix.multisite }}
     79      memcached: ${{ matrix.memcached }}
     80      phpunit-config: ${{ matrix.multisite && 'tests/phpunit/multisite.xml' || 'phpunit.xml.dist' }}
    22681
    22782  slack-notifications:
    22883    name: Slack Notifications
    22984    uses: WordPress/wordpress-develop/.github/workflows/slack-notifications.yml@trunk
     85    permissions:
     86      actions: read
     87      contents: read
    23088    needs: [ test-php ]
    23189    if: ${{ github.repository == 'WordPress/wordpress-develop' && github.event_name != 'pull_request' && always() }}
    23290    with:
    233       calling_status: ${{ needs.test-php.result == 'success' && 'success' || needs.test-php.result == 'cancelled' && 'cancelled' || 'failure' }}
     91      calling_status: ${{ contains( needs.*.result, 'cancelled' ) && 'cancelled' || contains( needs.*.result, 'failure' ) && 'failure' || 'success' }}
    23492    secrets:
    23593      SLACK_GHA_SUCCESS_WEBHOOK: ${{ secrets.SLACK_GHA_SUCCESS_WEBHOOK }}
    … …  
    24199    name: Failed workflow tasks
    242100    runs-on: ubuntu-latest
    243     needs: [ test-php, slack-notifications ]
     101    permissions:
     102      actions: write
     103    needs: [ slack-notifications ]
    244104    if: |
    245105      always() &&
    … …  
    248108      github.run_attempt < 2 &&
    249109      (
    250         needs.test-php.result == 'cancelled' || needs.test-php.result == 'failure'
     110        contains( needs.*.result, 'cancelled' ) ||
     111        contains( needs.*.result, 'failure' )
    251112      )
    252113
    253114    steps:
    254115      - name: Dispatch workflow run
    255         uses: actions/github-script@98814c53be79b1d30f795b907e553d8679345975 # v6.4.0
     116        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
    256117        with:
    257118          retries: 2

  • branches/5.2/.github/workflows/test-build-processes.yml

    r58624 r58625  
    1 name: Test npm
     1name: Test Build Processes
    22
    33on:
    … …  
    3434  cancel-in-progress: true
    3535
    36 env:
    37   PUPPETEER_SKIP_CHROMIUM_DOWNLOAD: ${{ true }}
     36# Disable permissions for all available scopes by default.
     37# Any needed permissions should be configured at the job level.
     38permissions: {}
    3839
    3940jobs:
    40   # Verifies that installing npm dependencies and building WordPress works as expected.
    41   #
    42   # Performs the following steps:
    43   # - Checks out the repository.
    44   # - Logs debug information about the GitHub Action runner.
    45   # - Installs Node.js.
    46   # _ Installs npm dependencies.
    47   # - Builds WordPress to run from the `build` directory.
    48   # - Cleans up after building WordPress to the `build` directory.
    49   # - Builds WordPress to run from the `src` directory.
    50   # - Cleans up after building WordPress to the `src` directory.
    51   test-npm:
    52     name: Test npm on ${{ matrix.os }}
    53     runs-on: ${{ matrix.os }}
    54     timeout-minutes: 20
     41  # Tests the WordPress Core build process on multiple operating systems.
     42  test-core-build-process:
     43    name: Core running from ${{ matrix.directory }}
     44    uses: WordPress/wordpress-develop/.github/workflows/reusable-test-core-build-process.yml@trunk
     45    permissions:
     46      contents: read
    5547    if: ${{ github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' }}
    5648    strategy:
    … …  
    5850      matrix:
    5951        os: [ ubuntu-latest, windows-latest ]
     52        directory: [ 'src', 'build' ]
     53        include:
     54          # Only prepare artifacts once.
     55          - os: ubuntu-latest
     56            directory: 'build'
     57            prepare-playground: true
     58    with:
     59      os: ${{ matrix.os }}
     60      directory: ${{ matrix.directory }}
     61      prepare-playground: ${{ matrix.prepare-playground && matrix.prepare-playground || false }}
     62      test-emoji: false
    6063
    61     steps:
    62       - name: Checkout repository
    63         uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
    64 
    65       - name: Log debug information
    66         run: |
    67           npm --version
    68           node --version
    69           curl --version
    70           git --version
    71           svn --version
    72 
    73       - name: Install Node.js
    74         uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3.6.0
    75         with:
    76           node-version-file: '.nvmrc'
    77           cache: npm
    78 
    79       - name: Install Dependencies
    80         run: npm ci
    81 
    82       - name: Build WordPress
    83         run: npm run build
    84 
    85       - name: Clean after building
    86         run: npm run grunt clean
    87 
    88       - name: Build WordPress in /src
    89         run: npm run build:dev
    90 
    91       - name: Clean after building in /src
    92         run: npm run grunt clean -- --dev
    93 
    94   # Verifies that installing npm dependencies and building WordPress works as expected on MacOS.
     64  # Tests the WordPress Core build process on MacOS.
    9565  #
    96   # This is separate from the job above in order to use stricter conditions about when to run.
     66  # This is separate from the job above in order to use stricter conditions when determining when to run.
    9767  # This avoids unintentionally consuming excessive minutes, as MacOS jobs consume minutes at a 10x rate.
    9868  #
    … …  
    10070  # currently no way to determine the OS being used on a given job.
    10171  # See https://docs.github.com/en/actions/learn-github-actions/contexts#context-availability.
    102   #
    103   # Performs the following steps:
    104   # - Checks out the repository.
    105   # - Logs debug information about the GitHub Action runner.
    106   # - Installs Node.js.
    107   # _ Installs npm dependencies.
    108   # - Builds WordPress to run from the `build` directory.
    109   # - Cleans up after building WordPress to the `build` directory.
    110   # - Builds WordPress to run from the `src` directory.
    111   # - Cleans up after building WordPress to the `src` directory.
    112   test-npm-macos:
    113     name: Test npm on MacOS
    114     runs-on: macos-latest
    115     timeout-minutes: 30
     72  test-core-build-process-macos:
     73    name: Core running from ${{ matrix.directory }}
     74    uses: WordPress/wordpress-develop/.github/workflows/reusable-test-core-build-process.yml@trunk
     75    permissions:
     76      contents: read
    11677    if: ${{ github.repository == 'WordPress/wordpress-develop' }}
    117     steps:
    118       - name: Checkout repository
    119         uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
    120 
    121       - name: Log debug information
    122         run: |
    123           npm --version
    124           node --version
    125           curl --version
    126           git --version
    127           svn --version
    128 
    129       - name: Install Node.js
    130         uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3.6.0
    131         with:
    132           node-version-file: '.nvmrc'
    133           cache: npm
    134 
    135       - name: Install Dependencies
    136         run: npm ci
    137 
    138       - name: Build WordPress
    139         run: npm run build
    140 
    141       - name: Clean after building
    142         run: npm run grunt clean
    143 
    144       - name: Build WordPress in /src
    145         run: npm run build:dev
    146 
    147       - name: Clean after building in /src
    148         run: npm run grunt clean -- --dev
     78    strategy:
     79      fail-fast: false
     80      matrix:
     81        os: [ macos-13 ]
     82        directory: [ 'src', 'build' ]
     83    with:
     84      os: ${{ matrix.os }}
     85      directory: ${{ matrix.directory }}
     86      test-emoji: false
    14987
    15088  slack-notifications:
    15189    name: Slack Notifications
    15290    uses: WordPress/wordpress-develop/.github/workflows/slack-notifications.yml@trunk
    153     needs: [ test-npm, test-npm-macos ]
     91    permissions:
     92      actions: read
     93      contents: read
     94    needs: [ test-core-build-process, test-core-build-process-macos ]
    15495    if: ${{ github.repository == 'WordPress/wordpress-develop' && github.event_name != 'pull_request' && always() }}
    15596    with:
    156       calling_status: ${{ needs.test-npm.result == 'success' && needs.test-npm-macos.result == 'success' && 'success' || ( needs.test-npm.result == 'cancelled' || needs.test-npm-macos.result == 'cancelled' ) && 'cancelled' || 'failure' }}
     97      calling_status: ${{ contains( needs.*.result, 'cancelled' ) && 'cancelled' || contains( needs.*.result, 'failure' ) && 'failure' || 'success' }}
    15798    secrets:
    15899      SLACK_GHA_SUCCESS_WEBHOOK: ${{ secrets.SLACK_GHA_SUCCESS_WEBHOOK }}
    … …  
    164105    name: Failed workflow tasks
    165106    runs-on: ubuntu-latest
    166     needs: [ test-npm, test-npm-macos, slack-notifications ]
     107    permissions:
     108      actions: write
     109    needs: [ slack-notifications ]
    167110    if: |
    168111      always() &&
    … …  
    171114      github.run_attempt < 2 &&
    172115      (
    173         needs.test-npm.result == 'cancelled' || needs.test-npm.result == 'failure' ||
    174         needs.test-npm-macos.result == 'cancelled' || needs.test-npm-macos.result == 'failure'
     116        contains( needs.*.result, 'cancelled' ) ||
     117        contains( needs.*.result, 'failure' )
    175118      )
    176119
    177120    steps:
    178121      - name: Dispatch workflow run
    179         uses: actions/github-script@98814c53be79b1d30f795b907e553d8679345975 # v6.4.0
     122        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
    180123        with:
    181124          retries: 2

  • branches/5.2/.gitignore

    r45125 r58625  
    1010/.phpcs.xml
    1111/phpcs.xml
     12.cache/*
    1213/tests/phpunit/data/plugins/wordpress-importer
    1314/tests/phpunit/data/.trac-ticket-cache*
    … …  
    7374.svn
    7475!/src/js/_enqueues/vendor
     76
     77# Files for local environment config
     78/docker-compose.override.yml

  • branches/5.2/docker-compose.yml

    r55523 r58625  
    1 version: '3.7'
    2 
    31services:
    42
    … …  
    2624
    2725    depends_on:
    28       - php
     26      php:
     27        condition: service_started
     28      mysql:
     29        condition: service_healthy
    2930
    3031  ##
    … …  
    3839
    3940    environment:
    40       LOCAL_PHP_XDEBUG: ${LOCAL_PHP_XDEBUG-false}
    41       LOCAL_PHP_MEMCACHED: ${LOCAL_PHP_MEMCACHED-false}
    42       PHP_FPM_UID: ${PHP_FPM_UID-1000}
    43       PHP_FPM_GID: ${PHP_FPM_GID-1000}
     41      - LOCAL_PHP_XDEBUG=${LOCAL_PHP_XDEBUG-false}
     42      - XDEBUG_MODE=${LOCAL_PHP_XDEBUG_MODE-develop,debug}
     43      - LOCAL_PHP_MEMCACHED=${LOCAL_PHP_MEMCACHED-false}
     44      - PHP_FPM_UID=${PHP_FPM_UID-1000}
     45      - PHP_FPM_GID=${PHP_FPM_GID-1000}
     46      - GITHUB_REF=${GITHUB_REF-false}
     47      - GITHUB_EVENT_NAME=${GITHUB_EVENT_NAME-false}
    4448
    4549    volumes:
    … …  
    4751      - ./:/var/www
    4852
    49     depends_on:
    50       - mysql
     53    # Copy or delete the Memcached dropin plugin file as appropriate.
     54    command: /bin/sh -c "if [ $LOCAL_PHP_MEMCACHED = true ]; then cp -n /var/www/tests/phpunit/includes/object-cache.php /var/www/src/wp-content/object-cache.php; else rm -f /var/www/src/wp-content/object-cache.php; fi && exec php-fpm"
     55
     56    # The init directive ensures the command runs with a PID > 1, so Ctrl+C works correctly.
     57    init: true
     58
     59    extra_hosts:
     60      - localhost:host-gateway
    5161
    5262  ##
    … …  
    5464  ##
    5565  mysql:
    56     image: amd64/${LOCAL_DB_TYPE-mysql}:${LOCAL_DB_VERSION-5.7}
     66    image: ${LOCAL_DB_TYPE-mysql}:${LOCAL_DB_VERSION-5.7}
     67    platform: linux/amd64
    5768
    5869    networks:
    … …  
    7283    command: --default-authentication-plugin=mysql_native_password
    7384
     85    healthcheck:
     86      test: [ "CMD-SHELL", "if [ \"$LOCAL_DB_TYPE\" = \"mariadb\" ]; then mariadb-admin ping -h localhost; else mysqladmin ping -h localhost; fi" ]
     87      timeout: 5s
     88      interval: 5s
     89      retries: 10
     90
    7491  ##
    7592  # The WP CLI container.
    … …  
    8299
    83100    environment:
    84       LOCAL_PHP_XDEBUG: ${LOCAL_PHP_XDEBUG-false}
    85       LOCAL_PHP_MEMCACHED: ${LOCAL_PHP_MEMCACHED-false}
    86       PHP_FPM_UID: ${PHP_FPM_UID-1000}
    87       PHP_FPM_GID: ${PHP_FPM_GID-1000}
     101      - LOCAL_PHP_XDEBUG=${LOCAL_PHP_XDEBUG-false}
     102      - LOCAL_PHP_MEMCACHED=${LOCAL_PHP_MEMCACHED-false}
     103      - PHP_FPM_UID=${PHP_FPM_UID-1000}
     104      - PHP_FPM_GID=${PHP_FPM_GID-1000}
    88105
    89106    volumes:
    … …  
    92109    # The init directive ensures the command runs with a PID > 1, so Ctrl+C works correctly.
    93110    init: true
     111
     112    extra_hosts:
     113      - localhost:host-gateway
     114
     115    depends_on:
     116      php:
     117        condition: service_started
     118      mysql:
     119        condition: service_healthy
    94120
    95121  ##
    … …  
    103129
    104130    environment:
    105       LOCAL_PHP_XDEBUG: ${LOCAL_PHP_XDEBUG-false}
    106       LOCAL_PHP_MEMCACHED: ${LOCAL_PHP_MEMCACHED-false}
    107       LOCAL_DIR: ${LOCAL_DIR-src}
    108       WP_MULTISITE: ${WP_MULTISITE-false}
    109       PHP_FPM_UID: ${PHP_FPM_UID-1000}
    110       PHP_FPM_GID: ${PHP_FPM_GID-1000}
    111       TRAVIS_BRANCH: ${TRAVIS_BRANCH-false}
    112       TRAVIS_PULL_REQUEST: ${TRAVIS_PULL_REQUEST-false}
     131      - LOCAL_PHP_XDEBUG=${LOCAL_PHP_XDEBUG-false}
     132      - LOCAL_PHP_MEMCACHED=${LOCAL_PHP_MEMCACHED-false}
     133      - PHP_FPM_UID=${PHP_FPM_UID-1000}
     134      - PHP_FPM_GID=${PHP_FPM_GID-1000}
     135      - LOCAL_DIR=${LOCAL_DIR-src}
     136      - WP_MULTISITE=${WP_MULTISITE-false}
     137      - GITHUB_REF=${GITHUB_REF-false}
     138      - GITHUB_EVENT_NAME=${GITHUB_EVENT_NAME-false}
    113139
    114140    volumes:
    … …  
    121147
    122148    depends_on:
    123       - mysql
     149      php:
     150        condition: service_started
     151      mysql:
     152        condition: service_healthy
     153
     154  ##
     155  # The Memcached container.
     156  ##
     157  memcached:
     158    image: memcached
     159
     160    networks:
     161      - wpdevnet
     162
     163    ports:
     164      - 11211:11211
     165
     166    depends_on:
     167      php:
     168        condition: service_started
    124169
    125170volumes:

  • branches/5.2/phpcs.xml.dist

    r44955 r58625  
    22<ruleset name="WordPress Coding Standards">
    33    <description>Apply WordPress Coding Standards to all Core files</description>
     4
     5    <arg name="cache" value=".cache/phpcs.json"/>
    46
    57    <rule ref="WordPress-Core"/>

  • branches/5.2/tests/phpunit/includes/abstract-testcase.php

    r50606 r58625  
    190190
    191191    /**
    192      * Allow tests to be skipped on some automated runs.
    193      *
    194      * For test runs on Travis for something other than trunk/master
    195      * we want to skip tests that only need to run for master.
     192     * Allows tests to be skipped on some automated runs.
     193     *
     194     * For test runs on GitHub Actions for something other than trunk,
     195     * we want to skip tests that only need to run for trunk.
    196196     */
    197197    public function skipOnAutomatedBranches() {
    198         // gentenv can be disabled
    199         if ( ! function_exists( 'getenv' ) ) {
    200             return false;
    201         }
    202 
    203         // https://docs.travis-ci.com/user/environment-variables/#Default-Environment-Variables
    204         $travis_branch       = getenv( 'TRAVIS_BRANCH' );
    205         $travis_pull_request = getenv( 'TRAVIS_PULL_REQUEST' );
    206 
    207         if ( false !== $travis_pull_request && 'master' !== $travis_branch ) {
    208             $this->markTestSkipped( 'For automated test runs, this test is only run on trunk/master' );
     198        // https://docs.github.com/en/actions/learn-github-actions/environment-variables#default-environment-variables
     199        $github_event_name = getenv( 'GITHUB_EVENT_NAME' );
     200        $github_ref        = getenv( 'GITHUB_REF' );
     201
     202        if ( $github_event_name ) {
     203            // We're on GitHub Actions.
     204            $skipped = array( 'pull_request', 'pull_request_target' );
     205
     206            if ( in_array( $github_event_name, $skipped, true ) || 'refs/heads/trunk' !== $github_ref ) {
     207                $this->markTestSkipped( 'For automated test runs, this test is only run on trunk' );
     208            }
    209209        }
    210210    }

  • branches/5.2/tools/local-env/scripts/docker.js

    r49527 r58625  
    55dotenvExpand( dotenv.config() );
    66
    7 // Execute any docker-compose command passed to this script.
    8 execSync( 'docker-compose ' + process.argv.slice( 2 ).join( ' ' ), { stdio: 'inherit' } );
     7// Execute any docker compose command passed to this script.
     8execSync( 'docker compose ' + process.argv.slice( 2 ).join( ' ' ), { stdio: 'inherit' } );

  • branches/5.2/tools/local-env/scripts/install.js

    r50305 r58625  
    4646 */
    4747function wp_cli( cmd ) {
    48     execSync( `docker-compose run --rm cli ${cmd}`, { stdio: 'inherit' } );
     48    execSync( `docker compose run --rm cli ${cmd}`, { stdio: 'inherit' } );
    4949}
    5050
    … …  
    5555    const test_plugin_directory = 'tests/phpunit/data/plugins/wordpress-importer';
    5656
    57     execSync( `docker-compose exec -T php rm -rf ${test_plugin_directory} && svn checkout -r ${process.env.WP_IMPORTER_REVISION} https://plugins.svn.wordpress.org/wordpress-importer/trunk/ ${test_plugin_directory}`, { stdio: 'inherit' } );
     57    execSync( `docker compose exec -T php rm -rf ${test_plugin_directory} && svn checkout -r ${process.env.WP_IMPORTER_REVISION} https://plugins.svn.wordpress.org/wordpress-importer/trunk/ ${test_plugin_directory}`, { stdio: 'inherit' } );
    5858}

  • branches/5.2/tools/local-env/scripts/start.js

    r49527 r58625  
    66
    77// Start the local-env containers.
    8 execSync( 'docker-compose up -d wordpress-develop', { stdio: 'inherit' } );
     8const containers = ( process.env.LOCAL_PHP_MEMCACHED === 'true' )
     9    ? 'wordpress-develop memcached'
     10    : 'wordpress-develop';
     11execSync( `docker compose up -d ${containers}`, { stdio: 'inherit' } );
    912
    1013// If Docker Toolbox is being used, we need to manually forward LOCAL_PORT to the Docker VM.
Note: See TracChangeset for help on using the changeset viewer.