Skip to content

Commit c2e97f2

Browse files
desrosjdesrosj
committed
Revert [50599].
Unprops desrosj. git-svn-id: https://develop.svn.wordpress.org/branches/5.7@50600 602fd350-edb4-49c9-b593-d223f7449a82
1 parent 0559bf3 commit c2e97f2

5 files changed

Lines changed: 65 additions & 81 deletions

File tree

‎.github/workflows/test-coverage.yml‎

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,9 @@
11
name: Code Coverage Report
22

33
on:
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'
134
# Once daily at 00:00 UTC.
145
schedule:
156
- cron: '0 0 * * *'
16-
# Allow manually triggering the workflow.
17-
workflow_dispatch:
187

198
env:
209
PUPPETEER_SKIP_CHROMIUM_DOWNLOAD: ${{ true }}
@@ -48,13 +37,9 @@ jobs:
4837
# - Run the PHPUnit tests as a multisite.
4938
# - Upload the multisite code coverage report to Codecov.io.
5039
test-coverage-report:
51-
name: ${{ matrix.multisite && 'Multisite' || 'Single site' }} report
40+
name: Generate a code coverage report
5241
runs-on: ubuntu-latest
5342
if: ${{ github.repository == 'WordPress/wordpress-develop' }}
54-
strategy:
55-
fail-fast: false
56-
matrix:
57-
multisite: [ false, true ]
5843

5944
steps:
6045
- name: Configure environment variables
@@ -65,6 +50,9 @@ jobs:
6550
- name: Checkout repository
6651
uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # v2.3.4
6752

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
55+
6856
- name: Log debug information
6957
run: |
7058
echo "$GITHUB_REF"
@@ -127,22 +115,18 @@ jobs:
127115
run: npm run env:install
128116

129117
- name: Run tests as a single site
130-
if: ${{ ! matrix.multisite }}
131118
run: npm run test:${{ env.PHPUNIT_SCRIPT }} -- --verbose -c phpunit.xml.dist --coverage-clover wp-code-coverage-single-clover-${{ github.sha }}.xml
132119

133120
- name: Upload single site report to Codecov
134-
if: ${{ ! matrix.multisite }}
135121
uses: codecov/codecov-action@e156083f13aff6830c92fc5faa23505779fbf649 # v1.2.1
136122
with:
137123
file: wp-code-coverage-single-clover-${{ github.sha }}.xml
138124
flags: single,php
139125

140126
- name: Run tests as a multisite install
141-
if: ${{ matrix.multisite }}
142127
run: npm run test:${{ env.PHPUNIT_SCRIPT }} -- --verbose -c tests/phpunit/multisite.xml --coverage-clover wp-code-coverage-multisite-clover-${{ github.sha }}.xml
143128

144129
- name: Upload multisite report to Codecov
145-
if: ${{ matrix.multisite }}
146130
uses: codecov/codecov-action@e156083f13aff6830c92fc5faa23505779fbf649 # v1.2.1
147131
with:
148132
file: wp-code-coverage-multisite-clover-${{ github.sha }}.xml

‎package-lock.json‎

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,10 @@
6666
"puppeteer": "npm:puppeteer-core@3.0.0",
6767
"qunit": "~2.14.1",
6868
"sass": "^1.32.8",
69-
"sinon": "~10.0.0",
69+
"sinon": "~9.2.4",
7070
"sinon-test": "~3.0.0",
7171
"source-map-loader": "^1.1.3",
72-
"uglify-js": "^3.13.2",
72+
"uglify-js": "^3.13.1",
7373
"uglifyjs-webpack-plugin": "2.2.0",
7474
"uuid": "8.3.2",
7575
"wait-on": "5.3.0",

‎phpunit.xml.dist‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -42,38 +42,38 @@
4242
</listeners>
4343
<filter>
4444
<whitelist addUncoveredFilesFromWhitelist="true">
45-
<directory suffix=".php">src</directory>
45+
<directory suffix=".php">build</directory>
4646
<exclude>
4747
<!-- Third party library exclusions. -->
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>
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>
5656

5757
<!-- Plugins and themes. -->
58-
<directory suffix=".php">src/wp-content/</directory>
58+
<directory suffix=".php">build/wp-content/</directory>
5959

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>
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>
6464

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>
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>
7777
</exclude>
7878
</whitelist>
7979
</filter>

‎tests/phpunit/multisite.xml‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -41,38 +41,38 @@
4141
</listeners>
4242
<filter>
4343
<whitelist addUncoveredFilesFromWhitelist="true">
44-
<directory suffix=".php">../../src</directory>
44+
<directory suffix=".php">../../build</directory>
4545
<exclude>
4646
<!-- Third party library exclusions. -->
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>
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>
5555

5656
<!-- Plugins and themes. -->
57-
<directory suffix=".php">../../src/wp-content/</directory>
57+
<directory suffix=".php">../../build/wp-content/</directory>
5858

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>
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>
6363

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>
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>
7676
</exclude>
7777
</whitelist>
7878
</filter>

0 commit comments

Comments
 (0)