Skip to content

Commit

Permalink
Merge branch 'release/3.0.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
JasonTheAdams committed Oct 16, 2023
2 parents 30f3c19 + 7bec5c8 commit 3b9cf4d
Show file tree
Hide file tree
Showing 900 changed files with 67,113 additions and 47,036 deletions.
20 changes: 0 additions & 20 deletions .babelrc

This file was deleted.

17 changes: 17 additions & 0 deletions .distignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,27 @@
.travis.yml
.editorconfig
.babelrc


/tests
/node_modules
/packages/form-builder/node_modules
/assets/src
/vendor/bin
/vendor/composer/installers

.travis.yml
.editorconfig
.babelrc
.babelrc.json
.jscrsrc
.jshintrc
.eslintignore
.eslintrc
.eslintrc.json
.prettierrc.json
.prettierignore
.phpcs.xml
.stylelintrc.json
.huskyrc.json
.lintstagedrc.json
Expand All @@ -41,6 +55,7 @@ phpstan.neon
sample-data/wordpress.sql
sample-data/sample-data.numbers
bower.json
build.php
composer.json
composer.lock
package.json
Expand All @@ -65,3 +80,5 @@ wp-textdomain.js
DOCKER_ENV
docker_tag
output.log
docker-compose.yml
wp-textdomain.js
2 changes: 2 additions & 0 deletions .github/workflows/php-compatibility.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,5 @@ on:
jobs:
build:
uses: impress-org/givewp-github-actions/.github/workflows/php-compatibility.yml@master
with:
test_versions: "[ '7.2', '8.0' ]"
23 changes: 9 additions & 14 deletions .github/workflows/wordpress.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ name: WordPress Tests
on:
# Triggers the workflow on push or pull request events but only for the master branch
push:
branches: [ master, develop, epic/** ]
branches: [ master, develop, epic/**, release/** ]
pull_request:
branches: [ master, develop, epic/** ]
branches: [ master, develop, epic/**, release/** ]

# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:
Expand All @@ -22,18 +22,13 @@ jobs:
runs-on: ubuntu-20.04
strategy:
matrix:
php: [ 7.0, 7.4, 8.0 ]
mysql: [ 'mysql:5.6', 'mysql:8.0' ]
wordpress: [ '5.0', latest ]
exclude:
- php: 7.4
wordpress: '5.0'
- php: 8.0
wordpress: '5.0'
php: [ 7.2, 7.4, 8.0 ]
mysql: [ 'mysql:5.7', 'mysql:8.0' ]
wordpress: [ '6.0', latest ]

services:
mysql56:
image: mysql:5.6
mysql57:
image: mysql:5.7
env:
MYSQL_ROOT_PASSWORD: N0Tweak!@123!
ports:
Expand Down Expand Up @@ -76,8 +71,8 @@ jobs:
- name: Store MySQL details in environment
run: |
case "$MYSQL_VERSION" in
'mysql:5.6')
MYSQL_PORT=${{ job.services.mysql56.ports[3306] }}
'mysql:5.7')
MYSQL_PORT=${{ job.services.mysql57.ports[3306] }}
MYSQL_PASS=N0Tweak!@123!
;;
'mysql:8.0')
Expand Down
11 changes: 10 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,12 @@ node_modules
assets/dist/
.storybook-static
release
public
.storybook-static
languages

# Composer
vendor

# PHPCS
.phpcs.xml
phpcs.xml
Expand All @@ -66,3 +68,10 @@ languages/*
build
**/build.*
**/build.asset.*
# Assert directory
assets/dist
build
**/build.*
**/build.asset.*

.phpunit.result.cache
1 change: 1 addition & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,6 @@ sample-data/*

# Ignore Files
phpcs.xml
phpcs.xml.dist
package-lock.json
composer.lock
Binary file modified .wordpress-org/banner-1544x500.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified .wordpress-org/banner-772x250.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added .wordpress-org/screenshot-10.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified .wordpress-org/screenshot-2.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified .wordpress-org/screenshot-5.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified .wordpress-org/screenshot-8.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added .wordpress-org/screenshot-9.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 3b9cf4d

Please sign in to comment.