WordPress.org
Get WordPress

Make WordPress Core


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

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

This updates the 4.1 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.
  • Improvements to the healthcheck command for the mysql container (#58867).

Merges [51673], [53552], [56464], [57918], [58157], [57124], [57125], [57249] to the 4.1 branch.

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

Location:
branches/4.1
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • branches/4.1

  • branches/4.1/docker-compose.yml

    r55535 r58644  
    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      - LOCAL_PHP_MEMCACHED=${LOCAL_PHP_MEMCACHED-false}
     43      - PHP_FPM_UID=${PHP_FPM_UID-1000}
     44      - PHP_FPM_GID=${PHP_FPM_GID-1000}
    4445
    4546    volumes:
    … …  
    4748      - ./:/var/www
    4849
    49     depends_on:
    50       - mysql
     50    # The init directive ensures the command runs with a PID > 1, so Ctrl+C works correctly.
     51    init: true
    5152
    5253  ##
    … …  
    5455  ##
    5556  mysql:
    56     image: amd64/${LOCAL_DB_TYPE-mysql}:${LOCAL_DB_VERSION-5.6}
     57    image: ${LOCAL_DB_TYPE-mysql}:${LOCAL_DB_VERSION-5.6}
     58    platform: linux/amd64
    5759
    5860    networks:
    … …  
    7274    command: --default-authentication-plugin=mysql_native_password
    7375
     76    healthcheck:
     77      test: [ "CMD-SHELL", "if [ \"$LOCAL_DB_TYPE\" = \"mariadb\" ]; then mariadb-admin ping -h localhost; else mysqladmin ping -h localhost; fi" ]
     78      timeout: 5s
     79      interval: 5s
     80      retries: 10
     81
    7482  ##
    7583  # The WP CLI container.
    … …  
    8290
    8391    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}
     92      - LOCAL_PHP_XDEBUG=${LOCAL_PHP_XDEBUG-false}
     93      - LOCAL_PHP_MEMCACHED=${LOCAL_PHP_MEMCACHED-false}
     94      - PHP_FPM_UID=${PHP_FPM_UID-1000}
     95      - PHP_FPM_GID=${PHP_FPM_GID-1000}
    8896
    8997    volumes:
    … …  
    92100    # The init directive ensures the command runs with a PID > 1, so Ctrl+C works correctly.
    93101    init: true
     102
     103    depends_on:
     104      php:
     105        condition: service_started
     106      mysql:
     107        condition: service_healthy
    94108
    95109  ##
    … …  
    103117
    104118    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}
    113       GITHUB_REF: ${GITHUB_REF-false}
    114       GITHUB_EVENT_NAME: ${GITHUB_EVENT_NAME-false}
     119      - LOCAL_PHP_XDEBUG=${LOCAL_PHP_XDEBUG-false}
     120      - LOCAL_PHP_MEMCACHED=${LOCAL_PHP_MEMCACHED-false}
     121      - LOCAL_DIR=${LOCAL_DIR-src}
     122      - WP_MULTISITE=${WP_MULTISITE-false}
     123      - PHP_FPM_UID=${PHP_FPM_UID-1000}
     124      - PHP_FPM_GID=${PHP_FPM_GID-1000}
     125      - TRAVIS_BRANCH=${TRAVIS_BRANCH-false}
     126      - TRAVIS_PULL_REQUEST=${TRAVIS_PULL_REQUEST-false}
     127      - GITHUB_REF=${GITHUB_REF-false}
     128      - GITHUB_EVENT_NAME=${GITHUB_EVENT_NAME-false}
    115129
    116130    volumes:
Note: See TracChangeset for help on using the changeset viewer.