Skip to content

Commit

Permalink
Merge branch 'stable' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
stklcode committed Nov 11, 2024
2 parents 29b3712 + 19fed41 commit 6d48b45
Show file tree
Hide file tree
Showing 11 changed files with 1,643 additions and 1,376 deletions.
1 change: 1 addition & 0 deletions .distignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
/.wordpress-org
/bin
/coverage
/dist
/node_modules
/tests
/vendor
Expand Down
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
/.stylelintrc.json export-ignore
/composer.json export-ignore
/composer-php5.json export-ignore
/dist export-ignore
/package.json export-ignore
/package-lock.json export-ignore
/composer.lock export-ignore
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
- name: Setup Node
uses: actions/setup-node@v4
with:
node-version: '20'
node-version: '22'
- name: Setup DB
uses: shogo82148/actions-setup-mysql@v1
with:
Expand Down Expand Up @@ -66,7 +66,7 @@ jobs:
- name: Setup Node
uses: actions/setup-node@v4
with:
node-version: '20'
node-version: '22'
- name: Install
run: |
composer install --no-interaction
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/wordpress-plugin-asset-update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: 7.4
php-version: 8.2
tools: composer
- name: Install
run: composer install --no-interaction
Expand Down
31 changes: 31 additions & 0 deletions .github/workflows/wordpress-plugin-check.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
name: Plugin check
on:
push:
branches: [ 'stable', 'release/*' ]
pull_request:
branches: [ 'stable' ]
jobs:
check:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4

- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: '8.2'
tools: composer

- name: Build
run: composer install --no-interaction

- name: Package plugin
run: |
mkdir -p ./dist
rsync -rc --exclude-from=.distignore ./ ./dist/statify --delete --delete-excluded
- name: Check WP plugin
uses: wordpress/plugin-check-action@v1
with:
build-dir: ./dist/statify
2 changes: 1 addition & 1 deletion .github/workflows/wordpress-plugin-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: 7.4
php-version: 8.2
tools: composer
- name: Install
run: composer install --no-interaction
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
.nyc_output
composer.lock
coverage
dist/
css/*.min.css
js/*.min.js
js/*.min.js.map
Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
# Changelog
All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/).

## 1.8.5
* Updated build environment
* Minor code style corrections
* Tested up to WordPress 6.7

## 1.8.4
* Use same date retrieval for tracking and analysis (#227) (#232)
* Replace input filtering for PHP 8.1 compatibility (#237)
Expand Down
Loading

0 comments on commit 6d48b45

Please sign in to comment.