Skip to content

Commit

Permalink
Merge branch 'develop' into trunk
Browse files Browse the repository at this point in the history
  • Loading branch information
jeffpaul committed Oct 26, 2020
2 parents b5fa715 + 0bf72d7 commit 46aba1b
Show file tree
Hide file tree
Showing 31 changed files with 6,396 additions and 846 deletions.
15 changes: 13 additions & 2 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,10 +1,21 @@
/.wordpress-org export-ignore
# Directories
/.git export-ignore
/.github export-ignore
/.wordpress-org export-ignore
/tests export-ignore

# Files
/.DS_Store export-ignore
/.gitattributes export-ignore
/.gitignore export-ignore
/CHANGELOG.md export-ignore
/CODE_OF_CONDUCT.md export-ignore
/composer.json export-ignore
/composer.lock export-ignore
/CONTRIBUTING.md export-ignore
/CREDITS.md export-ignore
/LICENSE.md export-ignore
/README.md export-ignore
/phpcs.xml export-ignore
/phpunit.xml export-ignore
/README.md export-ignore
/wpacceptance.json export-ignore
37 changes: 0 additions & 37 deletions .github/ISSUE_TEMPLATE/1-bug-report.md

This file was deleted.

25 changes: 0 additions & 25 deletions .github/ISSUE_TEMPLATE/2-feature-request.md

This file was deleted.

13 changes: 0 additions & 13 deletions .github/ISSUE_TEMPLATE/3-help.md

This file was deleted.

52 changes: 0 additions & 52 deletions .github/PULL_REQUEST_TEMPLATE.md

This file was deleted.

8 changes: 4 additions & 4 deletions .github/workflows/push-asset-readme-update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@ name: Plugin asset/readme update
on:
push:
branches:
- master
- trunk
jobs:
master:
name: Push to master
trunk:
name: Push to trunk
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@master
- name: WordPress.org plugin asset/readme update
uses: 10up/action-wordpress-plugin-asset-update@master
uses: 10up/action-wordpress-plugin-asset-update@stable
env:
SVN_PASSWORD: ${{ secrets.SVN_PASSWORD }}
SVN_USERNAME: ${{ secrets.SVN_USERNAME }}
2 changes: 1 addition & 1 deletion .github/workflows/push-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
steps:
- uses: actions/checkout@master
- name: WordPress Plugin Deploy
uses: 10up/action-wordpress-plugin-deploy@master
uses: 10up/action-wordpress-plugin-deploy@stable
env:
SVN_PASSWORD: ${{ secrets.SVN_PASSWORD }}
SVN_USERNAME: ${{ secrets.SVN_USERNAME }}
46 changes: 46 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
name: Test

on:
push:
branches:
- develop
- master
pull_request:
branches:
- develop

jobs:
test_wpa:
runs-on: ubuntu-latest

steps:
- name: Checkout
uses: actions/checkout@v2
- name: Set PHP version
uses: shivammathur/setup-php@v1
with:
php-version: '7.2'
coverage: none

- name: Install dependencies
run: composer install

- name: WP Acceptance Test
run: ./vendor/bin/wpacceptance run
test_phpunit:
runs-on: ubuntu-latest

steps:
- name: Checkout
uses: actions/checkout@v2
- name: Set PHP version
uses: shivammathur/setup-php@v1
with:
php-version: '7.2'
coverage: none

- name: Install dependencies
run: composer install

- name: PHPUnit Test
run: ./vendor/bin/phpunit
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
.DS_Store
node_modules/
vendor/
*.log
*.swp
.idea
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/icon-128x128.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/icon-256x256.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
28 changes: 28 additions & 0 deletions .wordpress-org/icon.svg
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 46aba1b

Please sign in to comment.