Changeset 55518
- Timestamp:
- 03/10/2023 04:07:44 PM (20 months ago)
- Location:
- branches/5.7
- Files:
-
- 3 deleted
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/5.7
- Property svn:mergeinfo changed
/trunk merged: 53736-53737,53940,53947,54039,54096,54108,54293,54313,54342-54343,54373,54511,54649-54651,54674,54750,54852,55152,55487
- Property svn:mergeinfo changed
-
branches/5.7/.env
r50285 r55518 58 58 # Defaults to 5.7 with the assumption that LOCAL_DB_TYPE is set to `mysql` above. 59 59 # 60 # When using `mysql`, see https://hub.docker.com/ _/mysql/for valid versions.61 # When using `mariadb`, see https://hub.docker.com/ _/mariadb for valid versions.60 # When using `mysql`, see https://hub.docker.com/r/amd64/mysql for valid versions. 61 # When using `mariadb`, see https://hub.docker.com/r/amd64/mariadb for valid versions. 62 62 ## 63 63 LOCAL_DB_VERSION=5.7 -
branches/5.7/.github/workflows/coding-standards.yml
r53598 r55518 10 10 - '[4-9].[0-9]' 11 11 tags: 12 - '3.[89]*' 13 - '[4-9].[0-9]*' 12 - '[0-9]+.[0-9]' 13 - '[0-9]+.[0-9].[0-9]+' 14 - '!3.7.[0-9]+' 14 15 pull_request: 15 16 branches: … … 21 22 - '**.js' 22 23 - '**.php' 23 # These files configure NPM. Changes could affect the outcome.24 # These files configure npm. Changes could affect the outcome. 24 25 - 'package*.json' 25 26 # These files configure Composer. Changes could affect the outcome. … … 62 63 steps: 63 64 - name: Checkout repository 64 uses: actions/checkout@ 2541b1294d2704b0964813337f33b291d3f8596b # v3.0.265 uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 65 66 66 67 - name: Set up PHP 67 uses: shivammathur/setup-php@ 3eda58347216592f618bb1dff277810b6698e4ca # v2.19.168 uses: shivammathur/setup-php@d30ad8b1843ace22e6698ab99bbafaa747b6bd0d # v2.24.0 68 69 with: 69 70 php-version: '7.4' … … 77 78 78 79 - name: Install Composer dependencies 79 uses: ramsey/composer-install@ f680dac46551dffb2234a240d65ae806c2999dd6 # v2.1.080 uses: ramsey/composer-install@83af392bf5f031813d25e6fe4cd626cdba9a2df6 # v2.2.0 80 81 with: 81 composer-options: "--no-progress --no-ansi --no-interaction"82 composer-options: "--no-progress --no-ansi" 82 83 83 84 - name: Make Composer packages available globally … … 100 101 # - Checks out the repository. 101 102 # - Logs debug information about the GitHub Action runner. 102 # - Installs Node JS.103 # - Installs Node.js. 103 104 # - Logs updated debug information. 104 # _ Installs NPMdependencies.105 # _ Installs npm dependencies. 105 106 # - Run the WordPress JSHint checks. 106 107 jshint: … … 114 115 steps: 115 116 - name: Checkout repository 116 uses: actions/checkout@ 2541b1294d2704b0964813337f33b291d3f8596b # v3.0.2117 uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 117 118 118 119 - name: Log debug information … … 123 124 svn --version 124 125 125 - name: Install Node JS126 uses: actions/setup-node@ eeb10cff27034e7acf239c5d29f62154018672fd # v3.3.0126 - name: Install Node.js 127 uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3.6.0 127 128 with: 128 129 node-version-file: '.nvmrc' … … 152 153 SLACK_GHA_FIXED_WEBHOOK: ${{ secrets.SLACK_GHA_FIXED_WEBHOOK }} 153 154 SLACK_GHA_FAILURE_WEBHOOK: ${{ secrets.SLACK_GHA_FAILURE_WEBHOOK }} 155 156 failed-workflow: 157 name: Failed workflow tasks 158 runs-on: ubuntu-latest 159 needs: [ phpcs, jshint, slack-notifications ] 160 if: | 161 always() && 162 github.repository == 'WordPress/wordpress-develop' && 163 github.event_name != 'pull_request' && 164 github.run_attempt < 2 && 165 ( 166 needs.phpcs.result == 'cancelled' || needs.phpcs.result == 'failure' || 167 needs.jshint.result == 'cancelled' || needs.jshint.result == 'failure' 168 ) 169 170 steps: 171 - name: Dispatch workflow run 172 uses: actions/github-script@98814c53be79b1d30f795b907e553d8679345975 # v6.4.0 173 with: 174 retries: 2 175 retry-exempt-status-codes: 418 176 script: | 177 github.rest.actions.createWorkflowDispatch({ 178 owner: context.repo.owner, 179 repo: context.repo.repo, 180 workflow_id: 'failed-workflow.yml', 181 ref: 'trunk', 182 inputs: { 183 run_id: '${{ github.run_id }}' 184 } 185 }); -
branches/5.7/.github/workflows/javascript-tests.yml
r53598 r55518 9 9 - '[4-9].[0-9]' 10 10 tags: 11 - '3.[89]*' 12 - '[4-9].[0-9]*' 11 - '[0-9]+.[0-9]' 12 - '[0-9]+.[0-9].[0-9]+' 13 - '!3.7.[0-9]+' 13 14 pull_request: 14 15 branches: … … 19 20 # Any change to a JavaScript file should run tests. 20 21 - '**.js' 21 # These files configure NPM. Changes could affect the outcome.22 # These files configure npm. Changes could affect the outcome. 22 23 - 'package*.json' 23 24 # This file configures ESLint. Changes could affect the outcome. … … 44 45 # - Checks out the repository. 45 46 # - Logs debug information about the GitHub Action runner. 46 # - Installs Node JS.47 # - Installs Node.js. 47 48 # - Logs updated debug information. 48 # _ Installs NPMdependencies.49 # _ Installs npm dependencies. 49 50 # - Run the WordPress QUnit tests. 50 51 test-js: … … 56 57 steps: 57 58 - name: Checkout repository 58 uses: actions/checkout@ 2541b1294d2704b0964813337f33b291d3f8596b # v3.0.259 uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 59 60 60 61 - name: Log debug information … … 65 66 svn --version 66 67 67 - name: Install NodeJS68 uses: actions/setup-node@ eeb10cff27034e7acf239c5d29f62154018672fd # v3.3.068 - name: Set up Node.js 69 uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3.6.0 69 70 with: 70 71 node-version-file: '.nvmrc' … … 94 95 SLACK_GHA_FIXED_WEBHOOK: ${{ secrets.SLACK_GHA_FIXED_WEBHOOK }} 95 96 SLACK_GHA_FAILURE_WEBHOOK: ${{ secrets.SLACK_GHA_FAILURE_WEBHOOK }} 97 98 failed-workflow: 99 name: Failed workflow tasks 100 runs-on: ubuntu-latest 101 needs: [ test-js, slack-notifications ] 102 if: | 103 always() && 104 github.repository == 'WordPress/wordpress-develop' && 105 github.event_name != 'pull_request' && 106 github.run_attempt < 2 && 107 ( 108 needs.test-js.result == 'cancelled' || needs.test-js.result == 'failure' 109 ) 110 111 steps: 112 - name: Dispatch workflow run 113 uses: actions/github-script@98814c53be79b1d30f795b907e553d8679345975 # v6.4.0 114 with: 115 retries: 2 116 retry-exempt-status-codes: 418 117 script: | 118 github.rest.actions.createWorkflowDispatch({ 119 owner: context.repo.owner, 120 repo: context.repo.repo, 121 workflow_id: 'failed-workflow.yml', 122 ref: 'trunk', 123 inputs: { 124 run_id: '${{ github.run_id }}' 125 } 126 }); -
branches/5.7/.github/workflows/php-compatibility.yml
r53605 r55518 9 9 - '[6-9].[0-9]' 10 10 tags: 11 - '5.[5-9]*' 12 - '[6-9].[0-9]*' 11 - '[0-9]+.[0-9]' 12 - '[0-9]+.[0-9].[0-9]+' 13 - '![34].[0-9].[0-9]+' 14 - '!5.[0-4].[0-9]+' 13 15 pull_request: 14 16 branches: … … 56 58 steps: 57 59 - name: Checkout repository 58 uses: actions/checkout@ 2541b1294d2704b0964813337f33b291d3f8596b # v3.0.260 uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 59 61 60 62 - name: Set up PHP 61 uses: shivammathur/setup-php@ 3eda58347216592f618bb1dff277810b6698e4ca # v2.19.163 uses: shivammathur/setup-php@d30ad8b1843ace22e6698ab99bbafaa747b6bd0d # v2.24.0 62 64 with: 63 65 php-version: '7.4' … … 71 73 72 74 - name: Install Composer dependencies 73 uses: ramsey/composer-install@ f680dac46551dffb2234a240d65ae806c2999dd6 # v2.1.075 uses: ramsey/composer-install@83af392bf5f031813d25e6fe4cd626cdba9a2df6 # v2.2.0 74 76 with: 75 composer-options: "--no-progress --no-ansi --no-interaction"77 composer-options: "--no-progress --no-ansi" 76 78 77 79 - name: Make Composer packages available globally … … 96 98 SLACK_GHA_FIXED_WEBHOOK: ${{ secrets.SLACK_GHA_FIXED_WEBHOOK }} 97 99 SLACK_GHA_FAILURE_WEBHOOK: ${{ secrets.SLACK_GHA_FAILURE_WEBHOOK }} 100 101 failed-workflow: 102 name: Failed workflow tasks 103 runs-on: ubuntu-latest 104 needs: [ php-compatibility, slack-notifications ] 105 if: | 106 always() && 107 github.repository == 'WordPress/wordpress-develop' && 108 github.event_name != 'pull_request' && 109 github.run_attempt < 2 && 110 ( 111 needs.php-compatibility.result == 'cancelled' || needs.php-compatibility.result == 'failure' 112 ) 113 114 steps: 115 - name: Dispatch workflow run 116 uses: actions/github-script@98814c53be79b1d30f795b907e553d8679345975 # v6.4.0 117 with: 118 retries: 2 119 retry-exempt-status-codes: 418 120 script: | 121 github.rest.actions.createWorkflowDispatch({ 122 owner: context.repo.owner, 123 repo: context.repo.repo, 124 workflow_id: 'failed-workflow.yml', 125 ref: 'trunk', 126 inputs: { 127 run_id: '${{ github.run_id }}' 128 } 129 }); -
branches/5.7/.github/workflows/phpunit-tests.yml
r53598 r55518 8 8 - '[4-9].[0-9]' 9 9 tags: 10 - ' 3.[7-9]*'11 - '[ 4-9].[0-9]*'10 - '[0-9]+.[0-9]' 11 - '[0-9]+.[0-9].[0-9]+' 12 12 pull_request: 13 13 branches: … … 29 29 env: 30 30 PUPPETEER_SKIP_CHROMIUM_DOWNLOAD: ${{ true }} 31 # Controls which NPMscript to use for running PHPUnit tests. Options ar `php` and `php-composer`.31 # Controls which npm script to use for running PHPUnit tests. Options ar `php` and `php-composer`. 32 32 PHPUNIT_SCRIPT: php 33 33 LOCAL_PHP_MEMCACHED: ${{ false }} … … 40 40 # - Sets environment variables. 41 41 # - Sets up the environment variables needed for testing with memcached (if desired). 42 # - Installs Node JS.43 # - Installs NPMdependencies42 # - Installs Node.js. 43 # - Installs npm dependencies 44 44 # - Configures caching for Composer. 45 45 # - Installs Composer dependencies. … … 108 108 109 109 - name: Checkout repository 110 uses: actions/checkout@ 2541b1294d2704b0964813337f33b291d3f8596b # v3.0.2111 112 - name: Install Node JS113 uses: actions/setup-node@ eeb10cff27034e7acf239c5d29f62154018672fd # v3.3.0110 uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 111 112 - name: Install Node.js 113 uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3.6.0 114 114 with: 115 115 node-version-file: '.nvmrc' 116 116 cache: npm 117 117 118 - name: Install Dependencies118 - name: Install npm dependencies 119 119 run: npm ci 120 120 121 - name: Get composer cache directory121 - name: Get Composer cache directory 122 122 id: composer-cache 123 run: echo " ::set-output name=dir::$(composer config cache-files-dir)"123 run: echo "composer_dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT 124 124 125 125 - name: Cache Composer dependencies 126 uses: actions/cache@ c3f1317a9e7b1ef106c153ac8c0f00fed3ddbc0d # v3.0.4126 uses: actions/cache@58c146cc91c5b9e778e71775dfe9bf1442ad9a12 # v3.2.3 127 127 env: 128 128 cache-name: cache-composer-dependencies 129 129 with: 130 path: ${{ steps.composer-cache.outputs. dir }}130 path: ${{ steps.composer-cache.outputs.composer_dir }} 131 131 key: ${{ runner.os }}-php-${{ matrix.php }}-composer-${{ hashFiles('**/composer.lock') }} 132 132 … … 224 224 - name: Checkout the WordPress Test Reporter 225 225 if: ${{ github.repository == 'WordPress/wordpress-develop' && github.ref == 'refs/heads/trunk' && matrix.report }} 226 uses: actions/checkout@ 2541b1294d2704b0964813337f33b291d3f8596b # v3.0.2226 uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 227 227 with: 228 228 repository: 'WordPress/phpunit-test-runner' … … 247 247 SLACK_GHA_FIXED_WEBHOOK: ${{ secrets.SLACK_GHA_FIXED_WEBHOOK }} 248 248 SLACK_GHA_FAILURE_WEBHOOK: ${{ secrets.SLACK_GHA_FAILURE_WEBHOOK }} 249 250 failed-workflow: 251 name: Failed workflow tasks 252 runs-on: ubuntu-latest 253 needs: [ test-php, slack-notifications ] 254 if: | 255 always() && 256 github.repository == 'WordPress/wordpress-develop' && 257 github.event_name != 'pull_request' && 258 github.run_attempt < 2 && 259 ( 260 needs.test-php.result == 'cancelled' || needs.test-php.result == 'failure' 261 ) 262 263 steps: 264 - name: Dispatch workflow run 265 uses: actions/github-script@98814c53be79b1d30f795b907e553d8679345975 # v6.4.0 266 with: 267 retries: 2 268 retry-exempt-status-codes: 418 269 script: | 270 github.rest.actions.createWorkflowDispatch({ 271 owner: context.repo.owner, 272 repo: context.repo.repo, 273 workflow_id: 'failed-workflow.yml', 274 ref: 'trunk', 275 inputs: { 276 run_id: '${{ github.run_id }}' 277 } 278 }); -
branches/5.7/.github/workflows/test-npm.yml
r53598 r55518 1 name: Test NPM1 name: Test npm 2 2 3 3 on: … … 7 7 - '3.[7-9]' 8 8 - '[4-9].[0-9]' 9 tags: 10 - '[0-9]+.[0-9]' 11 - '[0-9]+.[0-9].[0-9]+' 9 12 pull_request: 10 13 branches: … … 13 16 - '[4-9].[0-9]' 14 17 paths: 15 # These files configure NPM. Changes could affect the outcome.18 # These files configure npm. Changes could affect the outcome. 16 19 - 'package*.json' 17 # JavaScript files are built using NPM.20 # JavaScript files are built using npm. 18 21 - '**.js' 19 # CSS and SCSS files are built using NPM.22 # CSS and SCSS files are built using npm. 20 23 - '**.scss' 21 24 - '**.css' … … 35 38 36 39 jobs: 37 # Verifies that installing NPMdependencies and building WordPress works as expected.40 # Verifies that installing npm dependencies and building WordPress works as expected. 38 41 # 39 42 # Performs the following steps: 40 43 # - Checks out the repository. 41 44 # - Logs debug information about the GitHub Action runner. 42 # - Installs Node JS.43 # _ Installs NPMdependencies.45 # - Installs Node.js. 46 # _ Installs npm dependencies. 44 47 # - Builds WordPress to run from the `build` directory. 45 48 # - Cleans up after building WordPress to the `build` directory. … … 47 50 # - Cleans up after building WordPress to the `src` directory. 48 51 test-npm: 49 name: Test NPMon ${{ matrix.os }}52 name: Test npm on ${{ matrix.os }} 50 53 runs-on: ${{ matrix.os }} 51 54 timeout-minutes: 20 … … 58 61 steps: 59 62 - name: Checkout repository 60 uses: actions/checkout@ 2541b1294d2704b0964813337f33b291d3f8596b # v3.0.263 uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 61 64 62 65 - name: Log debug information … … 68 71 svn --version 69 72 70 - name: Install Node JS71 uses: actions/setup-node@ eeb10cff27034e7acf239c5d29f62154018672fd # v3.3.073 - name: Install Node.js 74 uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3.6.0 72 75 with: 73 76 node-version-file: '.nvmrc' … … 89 92 run: npm run grunt clean -- --dev 90 93 91 # Verifies that installing NPMdependencies and building WordPress works as expected on MacOS.94 # Verifies that installing npm dependencies and building WordPress works as expected on MacOS. 92 95 # 93 96 # This is separate from the job above in order to use stricter conditions about when to run. 94 97 # This avoids unintentionally consuming excessive minutes, as MacOS jobs consume minutes at a 10x rate. 95 98 # 99 # The `matrix` and `runner` contexts are not available for use within `if` expressions. So there is 100 # currently no way to determine the OS being used on a given job. 101 # See https://docs.github.com/en/actions/learn-github-actions/contexts#context-availability. 102 # 96 103 # Performs the following steps: 97 104 # - Checks out the repository. 98 105 # - Logs debug information about the GitHub Action runner. 99 # - Installs Node JS.100 # _ Installs NPMdependencies.106 # - Installs Node.js. 107 # _ Installs npm dependencies. 101 108 # - Builds WordPress to run from the `build` directory. 102 109 # - Cleans up after building WordPress to the `build` directory. … … 104 111 # - Cleans up after building WordPress to the `src` directory. 105 112 test-npm-macos: 106 name: Test NPMon MacOS113 name: Test npm on MacOS 107 114 runs-on: macos-latest 108 timeout-minutes: 20115 timeout-minutes: 30 109 116 if: ${{ github.repository == 'WordPress/wordpress-develop' }} 110 117 steps: 111 118 - name: Checkout repository 112 uses: actions/checkout@ 2541b1294d2704b0964813337f33b291d3f8596b # v3.0.2119 uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 113 120 114 121 - name: Log debug information … … 120 127 svn --version 121 128 122 - name: Install Node JS123 uses: actions/setup-node@ eeb10cff27034e7acf239c5d29f62154018672fd # v3.3.0129 - name: Install Node.js 130 uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3.6.0 124 131 with: 125 132 node-version-file: '.nvmrc' … … 153 160 SLACK_GHA_FIXED_WEBHOOK: ${{ secrets.SLACK_GHA_FIXED_WEBHOOK }} 154 161 SLACK_GHA_FAILURE_WEBHOOK: ${{ secrets.SLACK_GHA_FAILURE_WEBHOOK }} 162 163 failed-workflow: 164 name: Failed workflow tasks 165 runs-on: ubuntu-latest 166 needs: [ test-npm, test-npm-macos, slack-notifications ] 167 if: | 168 always() && 169 github.repository == 'WordPress/wordpress-develop' && 170 github.event_name != 'pull_request' && 171 github.run_attempt < 2 && 172 ( 173 needs.test-npm.result == 'cancelled' || needs.test-npm.result == 'failure' || 174 needs.test-npm-macos.result == 'cancelled' || needs.test-npm-macos.result == 'failure' 175 ) 176 177 steps: 178 - name: Dispatch workflow run 179 uses: actions/github-script@98814c53be79b1d30f795b907e553d8679345975 # v6.4.0 180 with: 181 retries: 2 182 retry-exempt-status-codes: 418 183 script: | 184 github.rest.actions.createWorkflowDispatch({ 185 owner: context.repo.owner, 186 repo: context.repo.repo, 187 workflow_id: 'failed-workflow.yml', 188 ref: 'trunk', 189 inputs: { 190 run_id: '${{ github.run_id }}' 191 } 192 }); -
branches/5.7/.github/workflows/welcome-new-contributors.yml
r53598 r55518 13 13 14 14 steps: 15 - uses: bubkoo/welcome-action@8dbbac2540d155744c90e4e37da6b05ffc9c5e2c # v1.0.315 - uses: wow-actions/welcome@72817eb31cda1de60f51893d80e2e82ce57f7e76 # v1.3.0 16 16 with: 17 GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}18 17 FIRST_PR_COMMENT: > 19 18 Hi @{{ author }}! 👋 -
branches/5.7/docker-compose.yml
r49836 r55518 54 54 ## 55 55 mysql: 56 image: ${LOCAL_DB_TYPE-mysql}:${LOCAL_DB_VERSION-latest}56 image: amd64/${LOCAL_DB_TYPE-mysql}:${LOCAL_DB_VERSION-latest} 57 57 58 58 networks:
Note: See TracChangeset
for help on using the changeset viewer.