WordPress.org
Get WordPress

Make WordPress Core

Changeset 50601


Ignore:
Timestamp:
03/26/2021 04:07:38 PM (3 years ago)
Author:
desrosj
Message:

Build/Test Tools: Backport several build tool fixes & improvements.

This backports a handful of test fixes related to generating code coverage reporting, as well as some devDependency updates.

Backports [50591-50595,50597-50598] to the 5.7 branch.
See #52624, #52786, #51734.

Location:
branches/5.7
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • branches/5.7

  • branches/5.7/.github/workflows/test-coverage.yml

    r50600 r50601  
    22
    33on:
     4  # Verify
     5  push:
     6    branches:
     7      - master
     8      - trunk
     9    paths:
     10      - '.github/workflows/test-coverage.yml'
     11      - 'phpunit.xml.dist'
     12      - 'tests/phpunit/multisite.xml'
    413  # Once daily at 00:00 UTC.
    514  schedule:
    615    - cron: '0 0 * * *'
     16  # Allow manually triggering the workflow.
     17  workflow_dispatch:
    718
    819env:
    … …  
    3849  # - Upload the multisite code coverage report to Codecov.io.
    3950  test-coverage-report:
    40     name: Generate a code coverage report
     51    name: ${{ matrix.multisite && 'Multisite' || 'Single site' }} report
    4152    runs-on: ubuntu-latest
    4253    if: ${{ github.repository == 'WordPress/wordpress-develop' }}
     54    strategy:
     55      fail-fast: false
     56      matrix:
     57        multisite: [ false, true ]
    4358
    4459    steps:
    … …  
    5065      - name: Checkout repository
    5166        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # v2.3.4
    52 
    53       - name: Checkout the WordPress Importer plugin
    54         run: svn checkout -r 2387243 https://plugins.svn.wordpress.org/wordpress-importer/trunk/ tests/phpunit/data/plugins/wordpress-importer
    5567
    5668      - name: Log debug information
    … …  
    116128
    117129      - name: Run tests as a single site
     130        if: ${{ ! matrix.multisite }}
    118131        run: npm run test:${{ env.PHPUNIT_SCRIPT }} -- --verbose -c phpunit.xml.dist --coverage-clover wp-code-coverage-single-clover-${{ github.sha }}.xml
    119132
    120133      - name: Upload single site report to Codecov
     134        if: ${{ ! matrix.multisite }}
    121135        uses: codecov/codecov-action@e156083f13aff6830c92fc5faa23505779fbf649 # v1.2.1
    122136        with:
    … …  
    125139
    126140      - name: Run tests as a multisite install
     141        if: ${{ matrix.multisite }}
    127142        run: npm run test:${{ env.PHPUNIT_SCRIPT }} -- --verbose -c tests/phpunit/multisite.xml --coverage-clover wp-code-coverage-multisite-clover-${{ github.sha }}.xml
    128143
    129144      - name: Upload multisite report to Codecov
     145        if: ${{ matrix.multisite }}
    130146        uses: codecov/codecov-action@e156083f13aff6830c92fc5faa23505779fbf649 # v1.2.1
    131147        with:

  • branches/5.7/package-lock.json

    r50600 r50601  
    39313931                        "unbzip2-stream": "^1.3.3",
    39323932                        "ws": "^7.2.3"
    3933                     },
    3934                     "dependencies": {
    3935                         "devtools-protocol": {
    3936                             "version": "0.0.818844",
    3937                             "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.818844.tgz",
    3938                             "integrity": "sha512-AD1hi7iVJ8OD0aMLQU5VK0XH9LDlA1+BcPIgrAxPfaibx2DbWucuyOhc4oyQCbnvDDO68nN6/LcKfqTP343Jjg==",
    3939                             "dev": true
    3940                         }
    39413933                    }
    39423934                },
    … …  
    80648056            "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.0.4.tgz",
    80658057            "integrity": "sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw==",
     8058            "dev": true
     8059        },
     8060        "devtools-protocol": {
     8061            "version": "0.0.818844",
     8062            "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.818844.tgz",
     8063            "integrity": "sha512-AD1hi7iVJ8OD0aMLQU5VK0XH9LDlA1+BcPIgrAxPfaibx2DbWucuyOhc4oyQCbnvDDO68nN6/LcKfqTP343Jjg==",
    80668064            "dev": true
    80678065        },
    … …  
    1634616344        },
    1634716345        "nise": {
    16348             "version": "4.0.4",
    16349             "resolved": "https://registry.npmjs.org/nise/-/nise-4.0.4.tgz",
    16350             "integrity": "sha512-bTTRUNlemx6deJa+ZyoCUTRvH3liK5+N6VQZ4NIw90AgDXY6iPnsqplNFf6STcj+ePk0H/xqxnP75Lr0J0Fq3A==",
     16346            "version": "4.1.0",
     16347            "resolved": "https://registry.npmjs.org/nise/-/nise-4.1.0.tgz",
     16348            "integrity": "sha512-eQMEmGN/8arp0xsvGoQ+B1qvSkR73B1nWSCh7nOt5neMCtwcQVYQGdzQMhcNscktTsWB54xnlSQFzOAPJD8nXA==",
    1635116349            "dev": true,
    1635216350            "requires": {
    … …  
    2053120529        },
    2053220530        "sinon": {
    20533             "version": "9.2.4",
    20534             "resolved": "https://registry.npmjs.org/sinon/-/sinon-9.2.4.tgz",
    20535             "integrity": "sha512-zljcULZQsJxVra28qIAL6ow1Z9tpattkCTEJR4RBP3TGc00FcttsP5pK284Nas5WjMZU5Yzy3kAIp3B3KRf5Yg==",
     20531            "version": "10.0.0",
     20532            "resolved": "https://registry.npmjs.org/sinon/-/sinon-10.0.0.tgz",
     20533            "integrity": "sha512-XAn5DxtGVJBlBWYrcYKEhWCz7FLwZGdyvANRyK06419hyEpdT0dMc5A8Vcxg5SCGHc40CsqoKsc1bt1CbJPfNw==",
    2053620534            "dev": true,
    2053720535            "requires": {
    … …  
    2054020538                "@sinonjs/samsam": "^5.3.1",
    2054120539                "diff": "^4.0.2",
    20542                 "nise": "^4.0.4",
     20540                "nise": "^4.1.0",
    2054320541                "supports-color": "^7.1.0"
    2054420542            },

  • branches/5.7/package.json

    r50600 r50601  
    6767        "qunit": "~2.14.1",
    6868        "sass": "^1.32.8",
    69         "sinon": "~9.2.4",
     69        "sinon": "~10.0.0",
    7070        "sinon-test": "~3.0.0",
    7171        "source-map-loader": "^1.1.3",
    72         "uglify-js": "^3.13.1",
     72        "uglify-js": "^3.13.2",
    7373        "uglifyjs-webpack-plugin": "2.2.0",
    7474        "uuid": "8.3.2",

  • branches/5.7/phpunit.xml.dist

    r50600 r50601  
    4343    <filter>
    4444        <whitelist addUncoveredFilesFromWhitelist="true">
    45             <directory suffix=".php">build</directory>
     45            <directory suffix=".php">src</directory>
    4646            <exclude>
    4747                <!-- Third party library exclusions. -->
    48                 <directory suffix=".php">build/wp-includes/ID3</directory>
    49                 <directory suffix=".php">build/wp-includes/IXR</directory>
    50                 <directory suffix=".php">build/wp-includes/random_compat</directory>
    51                 <directory suffix=".php">build/wp-includes/PHPMailer</directory>
    52                 <directory suffix=".php">build/wp-includes/Requests</directory>
    53                 <directory suffix=".php">build/wp-includes/SimplePie</directory>
    54                 <directory suffix=".php">build/wp-includes/sodium_compat</directory>
    55                 <directory suffix=".php">build/wp-includes/Text</directory>
     48                <directory suffix=".php">src/wp-includes/ID3</directory>
     49                <directory suffix=".php">src/wp-includes/IXR</directory>
     50                <directory suffix=".php">src/wp-includes/random_compat</directory>
     51                <directory suffix=".php">src/wp-includes/PHPMailer</directory>
     52                <directory suffix=".php">src/wp-includes/Requests</directory>
     53                <directory suffix=".php">src/wp-includes/SimplePie</directory>
     54                <directory suffix=".php">src/wp-includes/sodium_compat</directory>
     55                <directory suffix=".php">src/wp-includes/Text</directory>
    5656
    5757                <!-- Plugins and themes. -->
    58                 <directory suffix=".php">build/wp-content/</directory>
     58                <directory suffix=".php">src/wp-content/</directory>
    5959
    60                 <file>build/wp-admin/includes/class-ftp*</file>
    61                 <file>build/wp-admin/includes/class-pclzip.php</file>
    62                 <file>build/wp-admin/includes/deprecated.php</file>
    63                 <file>build/wp-admin/includes/ms-deprecated.php</file>
     60                <file>src/wp-admin/includes/class-ftp*</file>
     61                <file>src/wp-admin/includes/class-pclzip.php</file>
     62                <file>src/wp-admin/includes/deprecated.php</file>
     63                <file>src/wp-admin/includes/ms-deprecated.php</file>
    6464
    65                 <file>build/wp-includes/atomlib.php</file>
    66                 <file>build/wp-includes/class-IXR.php</file>
    67                 <file>build/wp-includes/class-json.php</file>
    68                 <file>build/wp-includes/class-phpass.php</file>
    69                 <file>build/wp-includes/class-pop3.php</file>
    70                 <file>build/wp-includes/class-requests.php</file>
    71                 <file>build/wp-includes/class-simplepie.php</file>
    72                 <file>build/wp-includes/class-snoopy.php</file>
    73                 <file>build/wp-includes/deprecated.php</file>
    74                 <file>build/wp-includes/ms-deprecated.php</file>
    75                 <file>build/wp-includes/pluggable-deprecated.php</file>
    76                 <file>build/wp-includes/rss.php</file>
     65                <file>src/wp-includes/atomlib.php</file>
     66                <file>src/wp-includes/class-IXR.php</file>
     67                <file>src/wp-includes/class-json.php</file>
     68                <file>src/wp-includes/class-phpass.php</file>
     69                <file>src/wp-includes/class-pop3.php</file>
     70                <file>src/wp-includes/class-requests.php</file>
     71                <file>src/wp-includes/class-simplepie.php</file>
     72                <file>src/wp-includes/class-snoopy.php</file>
     73                <file>src/wp-includes/deprecated.php</file>
     74                <file>src/wp-includes/ms-deprecated.php</file>
     75                <file>src/wp-includes/pluggable-deprecated.php</file>
     76                <file>src/wp-includes/rss.php</file>
    7777            </exclude>
    7878        </whitelist>

  • branches/5.7/tests/phpunit/multisite.xml

    r50600 r50601  
    4242    <filter>
    4343        <whitelist addUncoveredFilesFromWhitelist="true">
    44             <directory suffix=".php">../../build</directory>
     44            <directory suffix=".php">../../src</directory>
    4545            <exclude>
    4646                <!-- Third party library exclusions. -->
    47                 <directory suffix=".php">../../build/wp-includes/ID3</directory>
    48                 <directory suffix=".php">../../build/wp-includes/IXR</directory>
    49                 <directory suffix=".php">../../build/wp-includes/random_compat</directory>
    50                 <directory suffix=".php">../../build/wp-includes/PHPMailer</directory>
    51                 <directory suffix=".php">../../build/wp-includes/Requests</directory>
    52                 <directory suffix=".php">../../build/wp-includes/SimplePie</directory>
    53                 <directory suffix=".php">../../build/wp-includes/sodium_compat</directory>
    54                 <directory suffix=".php">../../build/wp-includes/Text</directory>
     47                <directory suffix=".php">../../src/wp-includes/ID3</directory>
     48                <directory suffix=".php">../../src/wp-includes/IXR</directory>
     49                <directory suffix=".php">../../src/wp-includes/random_compat</directory>
     50                <directory suffix=".php">../../src/wp-includes/PHPMailer</directory>
     51                <directory suffix=".php">../../src/wp-includes/Requests</directory>
     52                <directory suffix=".php">../../src/wp-includes/SimplePie</directory>
     53                <directory suffix=".php">../../src/wp-includes/sodium_compat</directory>
     54                <directory suffix=".php">../../src/wp-includes/Text</directory>
    5555
    5656                <!-- Plugins and themes. -->
    57                 <directory suffix=".php">../../build/wp-content/</directory>
     57                <directory suffix=".php">../../src/wp-content/</directory>
    5858
    59                 <file>../../build/wp-admin/includes/class-ftp*</file>
    60                 <file>../../build/wp-admin/includes/class-pclzip.php</file>
    61                 <file>../../build/wp-admin/includes/deprecated.php</file>
    62                 <file>../../build/wp-admin/includes/ms-deprecated.php</file>
     59                <file>../../src/wp-admin/includes/class-ftp*</file>
     60                <file>../../src/wp-admin/includes/class-pclzip.php</file>
     61                <file>../../src/wp-admin/includes/deprecated.php</file>
     62                <file>../../src/wp-admin/includes/ms-deprecated.php</file>
    6363
    64                 <file>../../build/wp-includes/atomlib.php</file>
    65                 <file>../../build/wp-includes/class-IXR.php</file>
    66                 <file>../../build/wp-includes/class-json.php</file>
    67                 <file>../../build/wp-includes/class-phpass.php</file>
    68                 <file>../../build/wp-includes/class-pop3.php</file>
    69                 <file>../../build/wp-includes/class-requests.php</file>
    70                 <file>../../build/wp-includes/class-simplepie.php</file>
    71                 <file>../../build/wp-includes/class-snoopy.php</file>
    72                 <file>../../build/wp-includes/deprecated.php</file>
    73                 <file>../../build/wp-includes/ms-deprecated.php</file>
    74                 <file>../../build/wp-includes/pluggable-deprecated.php</file>
    75                 <file>../../build/wp-includes/rss.php</file>
     64                <file>../../src/wp-includes/atomlib.php</file>
     65                <file>../../src/wp-includes/class-IXR.php</file>
     66                <file>../../src/wp-includes/class-json.php</file>
     67                <file>../../src/wp-includes/class-phpass.php</file>
     68                <file>../../src/wp-includes/class-pop3.php</file>
     69                <file>../../src/wp-includes/class-requests.php</file>
     70                <file>../../src/wp-includes/class-simplepie.php</file>
     71                <file>../../src/wp-includes/class-snoopy.php</file>
     72                <file>../../src/wp-includes/deprecated.php</file>
     73                <file>../../src/wp-includes/ms-deprecated.php</file>
     74                <file>../../src/wp-includes/pluggable-deprecated.php</file>
     75                <file>../../src/wp-includes/rss.php</file>
    7676            </exclude>
    7777        </whitelist>
Note: See TracChangeset for help on using the changeset viewer.