Skip to content

Commit

Permalink
Merge branch 'production' into feature/issue-66/add-assets-to-query-m…
Browse files Browse the repository at this point in the history
…onitor
  • Loading branch information
renatonascalves authored Jan 15, 2025
2 parents d5aa046 + 3aeee6b commit 61afbf6
Show file tree
Hide file tree
Showing 32 changed files with 874 additions and 741 deletions.
24 changes: 24 additions & 0 deletions .deployignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
.DS_Store
.github
.phpcs
.phpcs.xml
.phpunit.result.cache
.scaffolder
.scoper
*.sql
*.tar.gz
*.zip
bin
composer.lock
configure.php
DOCKER_ENV
Dockerfile
Makefile
node_modules/
output.log
phpunit.xml
phpunit.xml
tests
tests
Thumbs.db
wp-cli.local.yml
18 changes: 18 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
root = true

# Unix-style newlines with a newline ending every file.
[*]
charset = utf-8
end_of_line = lf
trim_trailing_whitespace = true
insert_final_newline = true
indent_style = tab

[*.{js,jsx,ts,tsx,scss,css,json,yaml,yml,feature}]
indent_style = space
indent_size = 2

# Dotfiles
[.*]
indent_style = space
indent_size = 2
65 changes: 65 additions & 0 deletions .github/workflows/all-pr-tests.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
name: "All Pull Request Tests"

on:
pull_request:
branches:
- develop
- production
types: [opened, synchronize, reopened, ready_for_review]

jobs:
# We use a single job to ensure that all steps run in the same environment and
# reduce the number of minutes used.
pr-tests:
# Don't run on draft PRs
if: github.event.pull_request.draft == false
# Timeout after 10 minutes
timeout-minutes: 10
# Define a matrix of PHP/WordPress versions to test against
strategy:
matrix:
php: [8.2, 8.3]
wordpress: ["latest"]
multisite: ["true", "false"]
runs-on: ubuntu-latest
# Cancel any existing runs of this workflow
concurrency:
group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.event.pull_request.number || github.ref }}-P${{ matrix.php }}-WP${{ matrix.wordpress }}-MS${{ matrix.multisite }}
cancel-in-progress: true
# Name the job in the matrix
name: "PR Tests PHP ${{ matrix.php }} WordPress ${{ matrix.wordpress }} Multisite ${{ matrix.multisite }}"
steps:
- uses: actions/checkout@v4

- name: Run General Tests
# See https://github.com/alleyinteractive/action-test-general for more options
uses: alleyinteractive/action-test-general@develop

- name: Run PHP Tests
# See https://github.com/alleyinteractive/action-test-php for more options
uses: alleyinteractive/action-test-php@develop
with:
php-version: '${{ matrix.php }}'
wordpress-version: '${{ matrix.wordpress }}'
skip-wordpress-install: 'true'
wordpress-multisite: '${{ matrix.multisite }}'
# This required job ensures that all PR checks have passed before merging.
all-pr-checks-passed:
name: All PR checks passed
needs:
- pr-tests
runs-on: ubuntu-latest
if: always()
steps:
- name: Check job statuses
run: |
if [[ "${{ contains(needs.*.result, 'failure') }}" == "true" ]]; then
echo "One or more jobs failed"
exit 1
elif [[ "${{ contains(needs.*.result, 'cancelled') }}" == "true" ]]; then
echo "One or more jobs were cancelled"
exit 1
else
echo "All jobs passed or were skipped"
exit 0
fi
19 changes: 19 additions & 0 deletions .github/workflows/built-release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
name: Built Branch and Release

on:
push:
branches:
- develop
- main
- production

permissions:
contents: write

jobs:
release:
name: "Built Branch and Release"
runs-on: ubuntu-latest
if: github.repository != 'alleyinteractive/create-wordpress-plugin'
steps:
- uses: alleyinteractive/action-release@develop
21 changes: 0 additions & 21 deletions .github/workflows/test.yml

This file was deleted.

18 changes: 15 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,22 @@
# Change Log
This project adheres to [Semantic Versioning](http://semver.org/).

## 1.3.8 (unreleased)
## 1.4.0

* Fix: `Asset_Manager_Preload::set_asset_types()` should return an empty array if no valid arguments are passed.
* Add: `convertDeprecationsToExceptions` to `phpunit.xml`.

### Fixed

- Added proper types for helper functions that support array in the first argument.
- Fix: `Asset_Manager_Preload::set_asset_types()` should return an empty array if no valid arguments are passed.

### Changed

* Migrates code into the `Alley\WP\Asset_Manager` namespace. Legacy classes such
as `Asset_Manager_Scripts` and `Asset_Manager_Styles` are aliased to their new
namespace for backward compatibility. Helper functions are left un-namespaced.
* Adds a dependency on Composer autoloader. For submodules, you can track the
`production-built` branch of the plugin or any tagged release (which will be
built) to include the dependencies.

## 1.3.7

Expand Down
Loading

0 comments on commit 61afbf6

Please sign in to comment.