Skip to content

Commit

Permalink
Merge branch 'release/1.2.0' into stable
Browse files Browse the repository at this point in the history
  • Loading branch information
admturner committed Apr 9, 2024
2 parents ab2e2e5 + 747309b commit 26d9c34
Show file tree
Hide file tree
Showing 14 changed files with 2,012 additions and 2,163 deletions.
2 changes: 2 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
.gitattributes export-ignore
.gitignore export-ignore
.npmpackagejsonlintrc.json export-ignore
.npmrc export-ignore
.nvmrc export-ignore
composer.json export-ignore
composer.lock export-ignore
CONTRIBUTING.md export-ignore
Expand Down
44 changes: 22 additions & 22 deletions .github/workflows/coding-standards.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,49 +14,49 @@ jobs:
lint:
name: Script and Style Coding Standards
runs-on: ubuntu-latest

steps:
- name: Checkout repository
uses: actions/checkout@v2
- name: Log debug information
run: |
npm --version
node --version
git --version
- name: Install NodeJS v14
uses: actions/setup-node@v2
uses: actions/checkout@v4

- name: Install Node.js
uses: actions/setup-node@v4
with:
node-version: 14
- name: Log debug information
run: |
npm --version
node --version
- name: Install npm dependencies
run: npm ci
- name: Run npmPkgJsonLint
node-version-file: '.nvmrc'
check-latest: true
cache: npm

- name: Npm install
run: npm install

- name: Lint package.json
run: npm run lint:pkg

phpcs:
name: PHP Coding Standards
runs-on: ubuntu-latest

steps:
- name: Checkout repository
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Set up PHP version
uses: shivammathur/setup-php@v2
with:
php-version: '7.4'
coverage: none
tools: composer, cs2pr
- name: Log debug information
run: |
php --version
composer --version

- name: Install Composer dependencies
uses: ramsey/composer-install@v1
with:
composer-options: "--no-progress --no-ansi --no-interaction"

- name: Make Composer packages available globally
run: echo "${PWD}/vendor/bin" >> $GITHUB_PATH

- name: Log PHPCS debug information
run: phpcs -i

- name: Run PHPCS
run: phpcs -q -n --report=checkstyle | cs2pr
run: phpcs -q -n --report=checkstyle . | cs2pr
3 changes: 3 additions & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
save-exact = true
engine-strict = true
legacy-peer-deps = true
1 change: 1 addition & 0 deletions .nvmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
20
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,16 @@ Changelog formatting (https://keepachangelog.com/en/1.0.0/):
### Security (in case of vulnerabilities.)
-->

## 1.2.0 (2024-04-09)

### Changed

- Bump WP tested-to to 6.5.0 to close #27.
- Upgrade Node.js to v20 and track version at project level. (89df427)
- Update composer packages and config. (922480a)
- Upgrade npm-package-json-lint from 6.0.3 to 7.1.0. (3609200)
- Update @wordpress/npm-package-json-lint-config from 4.1.2 to 4.39.0. (9e27fb6)

## 1.1.5 (2023-12-08)

### Changed
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# HRSWP GitHub Updater

[![Support Level](https://img.shields.io/badge/support-active-green.svg)](#support-level) [![Build Status](https://github.com/washingtonstateuniversity/hrswp-github-updater/actions/workflows/coding-standards.yml/badge.svg)](https://github.com/washingtonstateuniversity/hrswp-github-updater/actions) [![Release Version](https://img.shields.io/github/v/release/washingtonstateuniversity/hrswp-github-updater)](https://github.com/washingtonstateuniversity/hrswp-github-updater/releases/latest) ![WordPress tested up to version 6.4.2](https://img.shields.io/badge/WordPress-v6.4.2%20tested-success.svg) [![code style: prettier](https://img.shields.io/badge/code_style-prettier-ff69b4.svg)](https://github.com/prettier/prettier) [![GPLv3 License](https://img.shields.io/github/license/washingtonstateuniversity/hrswp-github-updater)](https://github.com/washingtonstateuniversity/hrswp-github-updater/blob/develop/LICENSE.md)
[![Support Level](https://img.shields.io/badge/support-active-green.svg)](#support-level) [![Build Status](https://github.com/washingtonstateuniversity/hrswp-github-updater/actions/workflows/coding-standards.yml/badge.svg)](https://github.com/washingtonstateuniversity/hrswp-github-updater/actions) [![Release Version](https://img.shields.io/github/v/release/washingtonstateuniversity/hrswp-github-updater)](https://github.com/washingtonstateuniversity/hrswp-github-updater/releases/latest) ![WordPress tested up to version 6.5.0](https://img.shields.io/badge/WordPress-v6.5.0%20tested-success.svg) [![code style: prettier](https://img.shields.io/badge/code_style-prettier-ff69b4.svg)](https://github.com/prettier/prettier) [![GPLv3 License](https://img.shields.io/github/license/washingtonstateuniversity/hrswp-github-updater)](https://github.com/washingtonstateuniversity/hrswp-github-updater/blob/develop/LICENSE.md)

## Overview

Expand Down
4 changes: 2 additions & 2 deletions admin/settings.php
Original file line number Diff line number Diff line change
Expand Up @@ -134,12 +134,12 @@ function unmanaged_plugins_nag() {
// If there are managed plugins, don't bother.
if ( ! empty( get_option( hrswp\plugin_meta( 'option_plugins' ) ) ) ) {
return;
};
}

// Check the plugin status option for unmanaged plugins nag ignore.
if ( 'show' !== options\get_plugin_option( 'unmanaged_plugins_nag' ) ) {
return;
};
}

// Display the notice if no plugins are being managed.
printf(
Expand Down
17 changes: 12 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,21 +1,28 @@
{
"name": "washingtonstateuniversity/hrswp-github-updater",
"type": "phpcodesniffer-hrs-standard",
"license": "GPL-3.0-or-later",
"authors": [
{
"name": "Adam Turner"
}
],
"config": {
"allow-plugins": {
"dealerdirect/phpcodesniffer-composer-installer": true
}
},
"prefer-stable": true,
"require-dev": {
"dealerdirect/phpcodesniffer-composer-installer": "~0.7.2",
"dealerdirect/phpcodesniffer-composer-installer": "*",
"squizlabs/php_codesniffer": "^3.6.2",
"phpcompatibility/php-compatibility": "^9.2.0",
"wp-coding-standards/wpcs": "~2.3.0",
"sirbrillig/phpcs-variable-analysis": "^2.11.3",
"phpcompatibility/phpcompatibility-wp": "^2",
"wp-coding-standards/wpcs": "^3.0.0",
"sirbrillig/phpcs-variable-analysis": "^2.11.2",
"roave/security-advisories": "dev-master"
},
"scripts": {
"format": "phpcbf --standard=phpcs.xml.dist --report=summary,source",
"lint": "phpcs --colors"
"lint": "phpcs --colors . "
}
}
Loading

0 comments on commit 26d9c34

Please sign in to comment.