Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

upkeep/php-reqs: Update PHP compat check to prevent fatal error #291

Merged
merged 8 commits into from
Aug 12, 2024
Merged
Show file tree
Hide file tree
Changes from 7 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .github/workflows/build-and-tag.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Install Composer dependencies
run: composer install --no-dev

- name: Install Dependencies
run: npm install
Expand Down
9 changes: 6 additions & 3 deletions .github/workflows/build-release-zip.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,21 +13,24 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Cache node_modules
id: cache-node-modules
uses: actions/cache@v3
uses: actions/cache@v4
env:
cache-name: cache-node-modules
with:
path: node_modules
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}

- name: Setup node version and npm cache
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version-file: '.nvmrc'

- name: Install Composer dependencies
run: composer install --no-dev

- name: Install Node dependencies
if: steps.cache-node-modules.outputs.cache-hit != 'true'
run: npm install
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/push-asset-readme-update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ jobs:
name: Push to trunk
runs-on: ubuntu-latest
steps:
- name: Checkout code
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

any reason this was removed? they can be helpful when reviewing check runs that fail to see where things are going wrong

Copy link
Member Author

@Sidsector9 Sidsector9 Aug 12, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You're correct, removed it mistakenly, fixed it in bbf74d7.

uses: actions/checkout@v4

- name: Setup node version
- name: Install Composer dependencies
run: composer install --no-dev
- name: Install node
uses: actions/setup-node@v4
with:
node-version-file: '.nvmrc'
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ bower_components
languages
release
vendor
10up-lib
composer.lock
phpunit.xml
.idea
Expand Down
103 changes: 61 additions & 42 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,44 +1,63 @@
{
"name": "10up/simple-local-avatars",
"description": "Adds an avatar upload field to user profiles. Generates requested sizes on demand just like Gravatar!",
"type": "wordpress-plugin",
"keywords": [
"wordpress",
"10up"
],
"homepage": "https://github.com/10up/simple-local-avatars",
"license": ["GPL-2.0-or-later"],
"authors": [
{
"name": "10up",
"homepage": "https://10up.com/"
}
],
"support": {
"issues": "https://github.com/10up/simple-local-avatars/issues",
"source": "https://github.com/10up/simple-local-avatars"
},
"require": {
"php": ">=7.4"
},
"require-dev": {
"10up/phpcs-composer": "dev-master",
"10up/wp_mock": "0.4.2",
"yoast/phpunit-polyfills": "^1.0"
},
"scripts": {
"lint": [
"phpcs . --runtime-set testVersion 7.4-"
],
"lint-fix": [
"phpcbf ."
],
"phpcs:compat": "vendor/bin/phpcs simple-local-avatars.php includes --standard=PHPCompatibilityWP --extensions=php --runtime-set testVersion 7.4-"
},
"minimum-stability": "dev",
"config": {
"allow-plugins": {
"dealerdirect/phpcodesniffer-composer-installer": true
}
}
"name": "10up/simple-local-avatars",
"description": "Adds an avatar upload field to user profiles. Generates requested sizes on demand just like Gravatar!",
"type": "wordpress-plugin",
"keywords": [
"wordpress",
"10up"
],
"homepage": "https://github.com/10up/simple-local-avatars",
"license": ["GPL-2.0-or-later"],
"authors": [
{
"name": "10up",
"homepage": "https://10up.com/"
}
],
"support": {
"issues": "https://github.com/10up/simple-local-avatars/issues",
"source": "https://github.com/10up/simple-local-avatars"
},
"require": {
"php": ">=7.4",
"10up/wp-compat-validation-tool": "dev-trunk"
},
"require-dev": {
"10up/phpcs-composer": "dev-master",
"10up/wp_mock": "0.4.2",
"yoast/phpunit-polyfills": "^1.0"
},
"scripts": {
"lint": [
"phpcs . --runtime-set testVersion 7.4-"
],
"lint-fix": [
"phpcbf ."
],
"phpcs:compat": "vendor/bin/phpcs simple-local-avatars.php includes --standard=PHPCompatibilityWP --extensions=php --runtime-set testVersion 7.4-",
"post-install-cmd": [
"./10up-lib/wp-compat-validation-tool/replace-namespace.sh SimpleLocalAvatarsValidator"
],
"post-update-cmd": [
"./10up-lib/wp-compat-validation-tool/replace-namespace.sh SimpleLocalAvatarsValidator"
]
},
"minimum-stability": "dev",
"config": {
"allow-plugins": {
"dealerdirect/phpcodesniffer-composer-installer": true,
"composer/installers": true
}
},
"repositories": [
{
"type": "git",
"url": "https://github.com/10up/wp-compat-validation-tool.git"
}
],
"extra": {
"installer-paths": {
"./{$name}/": ["10up/wp-compat-validation-tool"]
}
}
}
Loading
Loading