diff --git a/.github/workflows/local-docker-environment.yml b/.github/workflows/local-docker-environment.yml index 9e9b1259ea60d..bf275abd72205 100644 --- a/.github/workflows/local-docker-environment.yml +++ b/.github/workflows/local-docker-environment.yml @@ -92,7 +92,7 @@ jobs: fail-fast: false matrix: os: [ ubuntu-24.04 ] - memcached: [ false ] + memcached: [ false, true ] php: ${{ fromJSON( needs.build-test-matrix.outputs.php-versions ) }} db-version: ${{ fromJSON( needs.build-test-matrix.outputs.mysql-versions ) }} diff --git a/.github/workflows/performance.yml b/.github/workflows/performance.yml index 2db92975d7b28..43970724574ae 100644 --- a/.github/workflows/performance.yml +++ b/.github/workflows/performance.yml @@ -101,7 +101,7 @@ jobs: strategy: fail-fast: false matrix: - memcached: [ false ] + memcached: [ false, true ] multisite: [ true, false ] subject: ${{ fromJson( needs.determine-matrix.outputs.subjects ) }} with: @@ -119,7 +119,7 @@ jobs: strategy: fail-fast: false matrix: - memcached: [ false ] + memcached: [ false, true ] multisite: [ true, false ] # A matrix value is needed in the 'name' directive for proper grouping in the GitHub UI. label: [ Compare ] diff --git a/.github/workflows/reusable-end-to-end-tests.yml b/.github/workflows/reusable-end-to-end-tests.yml index 187ea7e241bb1..b0a70156bf137 100644 --- a/.github/workflows/reusable-end-to-end-tests.yml +++ b/.github/workflows/reusable-end-to-end-tests.yml @@ -81,12 +81,6 @@ jobs: show-progress: ${{ runner.debug == '1' && 'true' || 'false' }} persist-credentials: false - - name: Create a Docker override file - if: ${{ contains( fromJSON('["8.3", "8.4"]'), inputs.php-version ) }} - env: - PHP_VERSION: ${{ inputs.php-version }} - run: cp "tools/local-env/php-$PHP_VERSION-docker-compose.override.yml" docker-compose.override.yml - - name: Set up Node.js uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0 with: diff --git a/.github/workflows/reusable-performance-test-v2.yml b/.github/workflows/reusable-performance-test-v2.yml index a61234afb5e33..94b5f9933e65f 100644 --- a/.github/workflows/reusable-performance-test-v2.yml +++ b/.github/workflows/reusable-performance-test-v2.yml @@ -121,12 +121,6 @@ jobs: fetch-depth: ${{ github.event_name == 'workflow_dispatch' && '2' || '1' }} persist-credentials: false - - name: Create a Docker override file - if: ${{ contains( fromJSON('["8.3", "8.4"]'), inputs.php-version ) }} - env: - PHP_VERSION: ${{ inputs.php-version }} - run: cp "tools/local-env/php-$PHP_VERSION-docker-compose.override.yml" docker-compose.override.yml - - name: Set up Node.js uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0 with: diff --git a/.github/workflows/reusable-phpunit-tests-v3.yml b/.github/workflows/reusable-phpunit-tests-v3.yml index bae7dd436f5a3..fd4b83fdd4807 100644 --- a/.github/workflows/reusable-phpunit-tests-v3.yml +++ b/.github/workflows/reusable-phpunit-tests-v3.yml @@ -136,12 +136,6 @@ jobs: show-progress: ${{ runner.debug == '1' && 'true' || 'false' }} persist-credentials: false - - name: Create a Docker override file - if: ${{ contains( fromJSON('["8.3", "8.4"]'), inputs.php ) }} - env: - PHP_VERSION: ${{ inputs.php }} - run: cp "tools/local-env/php-${{ env.PHP_VERSION }}-docker-compose.override.yml" docker-compose.override.yml - - name: Set up Node.js uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0 with: diff --git a/.github/workflows/reusable-test-local-docker-environment-v1.yml b/.github/workflows/reusable-test-local-docker-environment-v1.yml index d62f4a1eb91e3..bc9b3d316d599 100644 --- a/.github/workflows/reusable-test-local-docker-environment-v1.yml +++ b/.github/workflows/reusable-test-local-docker-environment-v1.yml @@ -91,12 +91,6 @@ jobs: show-progress: ${{ runner.debug == '1' && 'true' || 'false' }} persist-credentials: false - - name: Create a Docker override file - if: ${{ contains( fromJSON('["8.3", "8.4"]'), inputs.php ) }} - env: - PHP_VERSION: ${{ inputs.php }} - run: cp "tools/local-env/php-$PHP_VERSION-docker-compose.override.yml" docker-compose.override.yml - - name: Set up Node.js uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0 with: diff --git a/tools/local-env/php-8.3-docker-compose.override.yml b/tools/local-env/php-8.3-docker-compose.override.yml deleted file mode 100644 index c9e2a647b4b8d..0000000000000 --- a/tools/local-env/php-8.3-docker-compose.override.yml +++ /dev/null @@ -1,16 +0,0 @@ -# This override file is a temporary solution to force the use of specific versions of the -# `wordpressdevelop/php` and `wordpressdevelop/cli` images while the cause of recent failures -# can be investigated. See https://core.trac.wordpress.org/ticket/63876. -services: - - php: - image: wordpressdevelop/php@sha256:c0ba85936a9d1ac2c98bf3da2d62ceb0e5787a6b11e383630df0c5a5bf2534b5 - - cli: - image: wordpressdevelop/cli@sha256:85ad7d7a9c3bd9a8775fc83aea7f7dfc0aad25b2bc4f7d740696b28cd2a0ef89 - - memcached: - # Pinning to the latest `bookworm` image is a temporary solution - # while the cause of recent failures can be investigated. - # See https://core.trac.wordpress.org/ticket/63876. - image: memcached:1.6.38-bookworm diff --git a/tools/local-env/php-8.4-docker-compose.override.yml b/tools/local-env/php-8.4-docker-compose.override.yml deleted file mode 100644 index 12f07e788c2b8..0000000000000 --- a/tools/local-env/php-8.4-docker-compose.override.yml +++ /dev/null @@ -1,16 +0,0 @@ -# This override file is a temporary solution to force the use of specific versions of the -# `wordpressdevelop/php` and `wordpressdevelop/cli` images while the cause of recent failures -# can be investigated. See https://core.trac.wordpress.org/ticket/63876. -services: - - php: - image: wordpressdevelop/php@sha256:56d6cbf10d25bfcb80852c09c2fc2e967922881b233b6161ad2999df509eb59a - - cli: - image: wordpressdevelop/cli@sha256:379f27b0c623c5cee5a7fbef1d617ce47fd3ba19158bac2e51861876fd68fdbf - - memcached: - # Pinning to the latest `bookworm` image is a temporary solution - # while the cause of recent failures can be investigated. - # See https://core.trac.wordpress.org/ticket/63876. - image: memcached:1.6.38-bookworm diff --git a/tools/local-env/scripts/install.js b/tools/local-env/scripts/install.js index 3ea702d021e24..44b9d1596a7ee 100644 --- a/tools/local-env/scripts/install.js +++ b/tools/local-env/scripts/install.js @@ -46,7 +46,7 @@ wait_on( { process.exit( 1 ); } ) .then( () => { - wp_cli( 'db reset --yes' ); + wp_cli( 'db reset --yes --defaults' ); const installCommand = process.env.LOCAL_MULTISITE === 'true' ? 'multisite-install' : 'install'; wp_cli( `core ${ installCommand } --title="WordPress Develop" --admin_user=admin --admin_password=password --admin_email=test@example.com --skip-email --url=http://localhost:${process.env.LOCAL_PORT}` ); } )