Skip to content

Commit

Permalink
Merge f72212d into d0b9dd3
Browse files Browse the repository at this point in the history
  • Loading branch information
PatelUtkarsh committed Sep 8, 2021
2 parents d0b9dd3 + f72212d commit b6b4935
Show file tree
Hide file tree
Showing 107 changed files with 68,799 additions and 51,079 deletions.
18 changes: 5 additions & 13 deletions .github/workflows/lint-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,15 @@ jobs:
needs: [lint]
name: "E2E tests (PHP ${{ matrix.php_versions }}, WordPress ${{ matrix.wp_versions }})"
runs-on: ubuntu-latest

continue-on-error: ${{ matrix.experimental == true }}
strategy:
fail-fast: false
matrix:
php_versions: [7.4]
wp_versions: [5.7]
wp_versions: [5.7, 5.8]
include:
- php_versions: 7.3
wp_versions: 5.2
wp_versions: 5.6

env:
NODE_ENV: teste2e
Expand Down Expand Up @@ -87,18 +87,12 @@ jobs:
npm run wp -- wp core install --title=WordPress --admin_user=admin --admin_password=password --admin_email=admin@example.com --skip-email --url=http://localhost:8088 --quiet
npm run wp -- wp plugin activate material-design
- name: Run E2E tests
if: ${{ matrix.wp_versions == '5.2' }}
run: npm run test:e2e

- name: Run E2E tests with coverage
if: ${{ matrix.wp_versions != '5.2' }}
run: |
sudo chown -R runner:runner plugin/tests node_modules # ensure coverage folder can be created
npm run test:e2e:coverage
- name: Coveralls
if: ${{ matrix.wp_versions != '5.2' }}
uses: coverallsapp/github-action@master
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
Expand Down Expand Up @@ -135,6 +129,7 @@ jobs:
needs: [lint]
name: "PHP tests (PHP ${{ matrix.php_versions }}, WordPress ${{ matrix.wp_versions }})"
runs-on: ${{ matrix.os }}
continue-on-error: ${{ matrix.experimental == true }}
strategy:
fail-fast: false
matrix:
Expand All @@ -145,6 +140,7 @@ jobs:
- php_versions: 7.4
wp_versions: "trunk"
os: ubuntu-latest
experimental: true

- php_versions: "7.0"
wp_versions: "latest"
Expand All @@ -154,10 +150,6 @@ jobs:
wp_versions: "latest"
os: ubuntu-18.04

- php_versions: 5.6.20
wp_versions: "5.2"
os: ubuntu-18.04

env:
WP_VERSION: ${{ matrix.wp_versions }}
COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
._.DS_Store
.env
.idea
.vscode
logs
material-design.zip
material-design-google.zip
yarn.lock
Expand Down
5 changes: 4 additions & 1 deletion .stylelintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@
"number-leading-zero": null,
"selector-class-pattern": null,
"selector-type-no-unknown": [ true, { "ignore": ["custom-elements"] } ],
"at-rule-no-unknown": [ true, { "ignoreAtRules": ["mixin"] } ]
"at-rule-no-unknown": [ true, { "ignoreAtRules": ["mixin"] } ],
"font-family-no-missing-generic-family-keyword": [ true, {
"ignoreFontFamilies": ["dashicons"]
}]
}
}
3 changes: 2 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@
"slowprog/composer-copy-file": "@stable",
"wp-coding-standards/wpcs": "@stable",
"xwp/wordpress-tests-installer": "@stable",
"xwp/wp-dev-lib": "@stable"
"xwp/wp-dev-lib": "@stable",
"yoast/phpunit-polyfills": "^1.0"
},
"scripts": {
"build": [
Expand Down
Loading

0 comments on commit b6b4935

Please sign in to comment.