Merge remote-tracking branch 'upstream/trunk' into try/html5lib-tests-using-group

Author: desrosj

.env.example

@@ -51,7 +51,7 @@ LOCAL_DB_TYPE=mysql
 # When using `mysql`, see https://hub.docker.com/_/mysql for valid versions.
 # When using `mariadb`, see https://hub.docker.com/_/mariadb for valid versions.
 ##
-LOCAL_DB_VERSION=8.0
+LOCAL_DB_VERSION=8.4
 
 # Whether or not to enable multisite.
 LOCAL_MULTISITE=false

.github/workflows/reusable-performance.yml

@@ -263,7 +263,9 @@ jobs:
       - name: Set the environment to the baseline version
         if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/trunk' }}
         run: |
-          npm run env:cli -- core update --version=${{ env.BASE_TAG }} --force --path=/var/www/${{ env.LOCAL_DIR }}
+          VERSION="${{ env.BASE_TAG }}"
+          VERSION="${VERSION%.0}"
+          npm run env:cli -- core update --version=$VERSION --force --path=/var/www/${{ env.LOCAL_DIR }}
           npm run env:cli -- core version --path=/var/www/${{ env.LOCAL_DIR }}
 
       - name: Run any database upgrades

.github/workflows/reusable-phpunit-tests-v3.yml

@@ -26,7 +26,7 @@ on:
         description: 'Database version'
         required: false
         type: 'string'
-        default: '8.0'
+        default: '8.4'
       multisite:
         description: 'Whether to run tests as multisite'
         required: false

.github/workflows/reusable-test-local-docker-environment-v1.yml

@@ -27,7 +27,7 @@ on:
         description: 'Database version'
         required: false
         type: 'string'
-        default: '8.0'
+        default: '8.4'
       memcached:
         description: 'Whether to enable memcached'
         required: false