Skip to content

Commit

Permalink
WIP for release changes
Browse files Browse the repository at this point in the history
  • Loading branch information
GaryJones committed Aug 22, 2023
1 parent 287eaae commit 087b15f
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 11 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/quicktest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,14 @@ jobs:
phpcs_version: 'dev-master'
wpcs_version: '2.3.*'
- php: '5.4'
phpcs_version: '3.7.1'
phpcs_version: '3.7.2'
wpcs_version: '2.3.*'

- php: 'latest'
phpcs_version: 'dev-master'
wpcs_version: '2.3.*'
- php: 'latest'
phpcs_version: '3.7.1'
phpcs_version: '3.7.2'
wpcs_version: '2.3.*'

name: "QTest${{ matrix.phpcs_version == 'dev-master' && ' + Lint' || '' }}: PHP ${{ matrix.php }} - PHPCS ${{ matrix.phpcs_version }}"
Expand Down
11 changes: 6 additions & 5 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,14 +66,14 @@ jobs:
# IMPORTANT: test runs shouldn't fail because of PHPCS being incompatible with a PHP version.
# - PHPCS will run without errors on PHP 5.4 - 7.4 on any supported version.
# - PHP 8.0 needs PHPCS 3.5.7+ to run without errors, and we require a higher minimum version.
# - PHP 8.1 needs PHPCS 3.6.1+ to run without errors, but works best with 3.7.1+, and we require at least this minimum version.
# - PHP 8.1 needs PHPCS 3.6.1+ to run without errors, but works best with 3.7.2+, and we require at least this minimum version.
# - The `wpcs_version` key is added to allow additional test builds when multiple WPCS versions
# would be supported. As, at this time, only the latest stable release of WPCS is supported,
# no additional versions are included in the array.
# - experimental: Whether the build is "allowed to fail".
matrix:
php: ['5.4', '5.5', '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2']
phpcs_version: ['3.7.1', 'dev-master']
phpcs_version: ['3.7.2', 'dev-master']
wpcs_version: ['2.3.*']
experimental: [false]

Expand Down Expand Up @@ -124,8 +124,8 @@ jobs:
if: ${{ startsWith( matrix.php, '8' ) == false }}
uses: "ramsey/composer-install@v2"
with:
# Bust the cache at least once a month - output format: YYYY-MM-DD.
custom-cache-suffix: $(date -u -d "-0 month -$(($(date +%d)-1)) days" "+%F")
# Bust the cache at least once a month - output format: YYYY-MM
custom-cache-suffix: $(date -u "+%Y-%m")

# PHPUnit 7.x does not allow for installation on PHP 8, so ignore platform
# requirements to get PHPUnit 7.x to install on nightly.
Expand All @@ -134,7 +134,8 @@ jobs:
uses: "ramsey/composer-install@v2"
with:
composer-options: --ignore-platform-reqs
custom-cache-suffix: $(date -u -d "-0 month -$(($(date +%d)-1)) days" "+%F")
# Bust the cache at least once a month - output format: YYYY-MM
custom-cache-suffix: $(date -u "+%Y-%m")

- name: Run the unit tests
run: ./bin/unit-tests
Expand Down
4 changes: 2 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),

## [2.3.4] - 2023-07-05

Increases requirements for PHPCS from 3.5.5+ to 3.7.1.
Increases requirements for PHPCS from 3.5.5+ to 3.7.2.

### Fixed
* Add `get_theme_file_path()` to list of allowed include functions by @kshaner in https://github.com/Automattic/VIP-Coding-Standards/pull/709.
* ProperEscapingFunction: Fix short tag detection by @GaryJones in https://github.com/Automattic/VIP-Coding-Standards/pull/748.

### Changed
* Composer:
* Up the minimum PHPCS version to 3.7.1 by @GaryJones in https://github.com/Automattic/VIP-Coding-Standards/pull/742.
* Up the minimum PHPCS version to 3.7.2 by @GaryJones in https://github.com/Automattic/VIP-Coding-Standards/pull/742.
* Allow for the 1.0.0 version of the Composer PHPCS plugin by @jrfnl in https://github.com/Automattic/VIP-Coding-Standards/pull/738.
* Update composer.json keywords by @GaryJones in https://github.com/Automattic/VIP-Coding-Standards/pull/721.
* Update PHP Parallel Lint and Console Highlighter by @jrfnl in https://github.com/Automattic/VIP-Coding-Standards/pull/714.
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Go to https://docs.wpvip.com/technical-references/code-review/phpcs-report/ to l
## Minimal requirements

* PHP 5.4+
* [PHPCS 3.7.1+](https://github.com/squizlabs/PHP_CodeSniffer/releases)
* [PHPCS 3.7.2+](https://github.com/squizlabs/PHP_CodeSniffer/releases)
* [WPCS 2.3.0+](https://github.com/WordPress-Coding-Standards/WordPress-Coding-Standards/releases)
* [VariableAnalysis 2.11.1+](https://github.com/sirbrillig/phpcs-variable-analysis/releases)

Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"php": ">=5.4",
"dealerdirect/phpcodesniffer-composer-installer": "^0.4.1 || ^0.5 || ^0.6.2 || ^0.7 || ^1.0",
"sirbrillig/phpcs-variable-analysis": "^2.11.1",
"squizlabs/php_codesniffer": "^3.7.1",
"squizlabs/php_codesniffer": "^3.7.2",
"wp-coding-standards/wpcs": "^2.3"
},
"require-dev": {
Expand Down

0 comments on commit 087b15f

Please sign in to comment.