Changeset 55535
- Timestamp:
- 03/10/2023 04:31:59 PM (21 months ago)
- Location:
- branches/4.1
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/4.1
- Property svn:mergeinfo changed
/trunk merged: 53736-53737,53940,53947,54039,54096,54108,54293,54313,54342-54343,54373,54511,54650-54651,54674,54750,54852,55152,55487
- Property svn:mergeinfo changed
-
branches/4.1/.env
r50320 r55535 58 58 # Defaults to 5.6 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.6 -
branches/4.1/.github/workflows/coding-standards.yml
r53620 r55535 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. … … 50 51 # - Installs NodeJS. 51 52 # - Logs updated debug information. 52 # _ Installs NPMdependencies.53 # _ Installs npm dependencies. 53 54 # - Run the WordPress JSHint checks. 54 55 jshint: … … 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: Log debug information … … 71 72 svn --version 72 73 73 - name: Install NodeJS74 uses: actions/setup-node@ eeb10cff27034e7acf239c5d29f62154018672fd # v3.3.074 - name: Set up Node.js 75 uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3.6.0 75 76 with: 76 77 node-version-file: '.nvmrc' … … 100 101 SLACK_GHA_FIXED_WEBHOOK: ${{ secrets.SLACK_GHA_FIXED_WEBHOOK }} 101 102 SLACK_GHA_FAILURE_WEBHOOK: ${{ secrets.SLACK_GHA_FAILURE_WEBHOOK }} 103 104 failed-workflow: 105 name: Failed workflow tasks 106 runs-on: ubuntu-latest 107 needs: [ jshint, slack-notifications ] 108 if: | 109 always() && 110 github.repository == 'WordPress/wordpress-develop' && 111 github.event_name != 'pull_request' && 112 github.run_attempt < 2 && 113 ( 114 needs.jshint.result == 'cancelled' || needs.jshint.result == 'failure' 115 ) 116 117 steps: 118 - name: Dispatch workflow run 119 uses: actions/github-script@98814c53be79b1d30f795b907e553d8679345975 # v6.4.0 120 with: 121 retries: 2 122 retry-exempt-status-codes: 418 123 script: | 124 github.rest.actions.createWorkflowDispatch({ 125 owner: context.repo.owner, 126 repo: context.repo.repo, 127 workflow_id: 'failed-workflow.yml', 128 ref: 'trunk', 129 inputs: { 130 run_id: '${{ github.run_id }}' 131 } 132 }); -
branches/4.1/.github/workflows/javascript-tests.yml
r53620 r55535 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. … … 46 47 # - Installs NodeJS. 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/4.1/.github/workflows/phpunit-tests.yml
r53620 r55535 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: … … 31 31 PUPPETEER_SKIP_CHROMIUM_DOWNLOAD: ${{ true }} 32 32 COMPOSER_INSTALL: ${{ false }} 33 # Controls which NPMscript to use for running PHPUnit tests. Options ar `php` and `php-composer`.33 # Controls which npm script to use for running PHPUnit tests. Options ar `php` and `php-composer`. 34 34 PHPUNIT_SCRIPT: php 35 35 LOCAL_PHP_MEMCACHED: ${{ false }} … … 43 43 # - Logs debug information about the GitHub Action runner. 44 44 # - Installs NodeJS. 45 # _ Installs NPMdependencies.45 # _ Installs npm dependencies. 46 46 # - Builds WordPress to run from the `build` directory. 47 47 # - Creates a ZIP file of compiled WordPress. … … 54 54 steps: 55 55 - name: Checkout repository 56 uses: actions/checkout@ 2541b1294d2704b0964813337f33b291d3f8596b # v3.0.256 uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 57 57 58 58 - name: Log debug information … … 69 69 locale -a 70 70 71 - name: Install NodeJS72 uses: actions/setup-node@ eeb10cff27034e7acf239c5d29f62154018672fd # v3.3.071 - name: Set up Node.js 72 uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3.6.0 73 73 with: 74 74 node-version-file: '.nvmrc' … … 82 82 83 83 - name: Create ZIP artifact 84 uses: thedoctor0/zip-release@ 09336613be18a8208dfa66bd57efafd9e2685657 # v0.6.284 uses: thedoctor0/zip-release@a24011d8d445e4da5935a7e73c1f98e22a439464 # v0.7.1 85 85 with: 86 86 filename: built-wp-${{ github.sha }}.zip … … 88 88 89 89 - name: Upload build artifact 90 uses: actions/upload-artifact@ 3cea5372237819ed00197afe530f5a7ea3e805c8 # v3.1.090 uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2 91 91 with: 92 92 name: built-wp-${{ github.sha }} … … 102 102 # - Unzips the artifact. 103 103 # - Installs NodeJS. 104 # _ Installs NPMdependencies.104 # _ Installs npm dependencies. 105 105 # - Configures caching for Composer. 106 106 # _ Installs Composer dependencies (if desired). … … 169 169 170 170 - name: Download the built WordPress artifact 171 uses: actions/download-artifact@ fb598a63ae348fa914e94cd0ff38f362e927b741 # v3.0.0171 uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2 172 172 with: 173 173 name: built-wp-${{ github.sha }} … … 176 176 run: unzip built-wp-${{ github.sha }}.zip 177 177 178 - name: Install NodeJS179 uses: actions/setup-node@ eeb10cff27034e7acf239c5d29f62154018672fd # v3.3.0178 - name: Set up Node.js 179 uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3.6.0 180 180 with: 181 181 node-version-file: '.nvmrc' … … 187 187 - name: Cache Composer dependencies 188 188 if: ${{ env.COMPOSER_INSTALL == true }} 189 uses: actions/cache@ c3f1317a9e7b1ef106c153ac8c0f00fed3ddbc0d # v3.0.4189 uses: actions/cache@69d9d449aced6a2ede0bc19182fadc3a0a42d2b0 # v3.2.6 190 190 env: 191 191 cache-name: cache-composer-dependencies … … 264 264 - name: Checkout the WordPress Test Reporter 265 265 if: ${{ github.repository == 'WordPress/wordpress-develop' && github.ref == 'refs/heads/trunk' && matrix.report }} 266 uses: actions/checkout@ 2541b1294d2704b0964813337f33b291d3f8596b # v3.0.2266 uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 267 267 with: 268 268 repository: 'WordPress/phpunit-test-runner' … … 295 295 SLACK_GHA_FIXED_WEBHOOK: ${{ secrets.SLACK_GHA_FIXED_WEBHOOK }} 296 296 SLACK_GHA_FAILURE_WEBHOOK: ${{ secrets.SLACK_GHA_FAILURE_WEBHOOK }} 297 298 failed-workflow: 299 name: Failed workflow tasks 300 runs-on: ubuntu-latest 301 needs: [ test-php, slack-notifications ] 302 if: | 303 always() && 304 github.repository == 'WordPress/wordpress-develop' && 305 github.event_name != 'pull_request' && 306 github.run_attempt < 2 && 307 ( 308 needs.test-php.result == 'cancelled' || needs.test-php.result == 'failure' 309 ) 310 311 steps: 312 - name: Dispatch workflow run 313 uses: actions/github-script@98814c53be79b1d30f795b907e553d8679345975 # v6.4.0 314 with: 315 retries: 2 316 retry-exempt-status-codes: 418 317 script: | 318 github.rest.actions.createWorkflowDispatch({ 319 owner: context.repo.owner, 320 repo: context.repo.repo, 321 workflow_id: 'failed-workflow.yml', 322 ref: 'trunk', 323 inputs: { 324 run_id: '${{ github.run_id }}' 325 } 326 }); -
branches/4.1/.github/workflows/test-npm.yml
r53620 r55535 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: … … 41 44 # - Logs debug information about the GitHub Action runner. 42 45 # - Installs NodeJS. 43 # - Sets up caching for NPM.44 # _ Installs NPMdependencies.46 # - Sets up caching for npm. 47 # _ Installs npm dependencies. 45 48 # - Builds WordPress to run from the `build` directory. 46 49 # - Cleans up after building WordPress to the `build` directory. 47 50 test-npm: 48 name: Test NPMon ${{ matrix.os }}51 name: Test npm on ${{ matrix.os }} 49 52 runs-on: ${{ matrix.os }} 50 53 timeout-minutes: 20 … … 56 59 steps: 57 60 - name: Checkout repository 58 uses: actions/checkout@ 2541b1294d2704b0964813337f33b291d3f8596b # v3.0.261 uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 59 62 60 63 - name: Log debug information … … 66 69 svn --version 67 70 68 - name: Install NodeJS69 uses: actions/setup-node@ eeb10cff27034e7acf239c5d29f62154018672fd # v3.3.071 - name: Set up Node.js 72 uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3.6.0 70 73 with: 71 74 node-version-file: '.nvmrc' … … 81 84 run: npm run grunt clean 82 85 83 # Verifies that installing NPMdependencies and building WordPress works as expected on MacOS.86 # Verifies that installing npm dependencies and building WordPress works as expected on MacOS. 84 87 # 85 88 # This is separate from the job above in order to use stricter conditions about when to run. 86 89 # This avoids unintentionally consuming excessive minutes, as MacOS jobs consume minutes at a 10x rate. 90 # 91 # The `matrix` and `runner` contexts are not available for use within `if` expressions. So there is 92 # currently no way to determine the OS being used on a given job. 93 # See https://docs.github.com/en/actions/learn-github-actions/contexts#context-availability. 87 94 # 88 95 # Performs the following steps: … … 90 97 # - Logs debug information about the GitHub Action runner. 91 98 # - Installs NodeJS. 92 # _ Installs NPMdependencies.99 # _ Installs npm dependencies. 93 100 # - Builds WordPress to run from the `build` directory. 94 101 # - Cleans up after building WordPress to the `build` directory. 95 102 test-npm-macos: 96 name: Test NPMon MacOS103 name: Test npm on MacOS 97 104 runs-on: macos-latest 105 timeout-minutes: 30 98 106 if: ${{ github.repository == 'WordPress/wordpress-develop' }} 99 107 steps: 100 108 - name: Checkout repository 101 uses: actions/checkout@ 2541b1294d2704b0964813337f33b291d3f8596b # v3.0.2109 uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 102 110 103 111 - name: Log debug information … … 109 117 svn --version 110 118 111 - name: Install NodeJS112 uses: actions/setup-node@ eeb10cff27034e7acf239c5d29f62154018672fd # v3.3.0119 - name: Set up Node.js 120 uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3.6.0 113 121 with: 114 122 node-version-file: '.nvmrc' … … 136 144 SLACK_GHA_FIXED_WEBHOOK: ${{ secrets.SLACK_GHA_FIXED_WEBHOOK }} 137 145 SLACK_GHA_FAILURE_WEBHOOK: ${{ secrets.SLACK_GHA_FAILURE_WEBHOOK }} 146 147 failed-workflow: 148 name: Failed workflow tasks 149 runs-on: ubuntu-latest 150 needs: [ test-npm, test-npm-macos, slack-notifications ] 151 if: | 152 always() && 153 github.repository == 'WordPress/wordpress-develop' && 154 github.event_name != 'pull_request' && 155 github.run_attempt < 2 && 156 ( 157 needs.test-npm.result == 'cancelled' || needs.test-npm.result == 'failure' || 158 needs.test-npm-macos.result == 'cancelled' || needs.test-npm-macos.result == 'failure' 159 ) 160 161 steps: 162 - name: Dispatch workflow run 163 uses: actions/github-script@98814c53be79b1d30f795b907e553d8679345975 # v6.4.0 164 with: 165 retries: 2 166 retry-exempt-status-codes: 418 167 script: | 168 github.rest.actions.createWorkflowDispatch({ 169 owner: context.repo.owner, 170 repo: context.repo.repo, 171 workflow_id: 'failed-workflow.yml', 172 ref: 'trunk', 173 inputs: { 174 run_id: '${{ github.run_id }}' 175 } 176 }); -
branches/4.1/.github/workflows/welcome-new-contributors.yml
r53620 r55535 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/4.1/docker-compose.yml
r50320 r55535 54 54 ## 55 55 mysql: 56 image: ${LOCAL_DB_TYPE-mysql}:${LOCAL_DB_VERSION-5.6}56 image: amd64/${LOCAL_DB_TYPE-mysql}:${LOCAL_DB_VERSION-5.6} 57 57 58 58 networks:
Note: See TracChangeset
for help on using the changeset viewer.