Skip to content

Commit

Permalink
Merge pull request #914 from vektor-inc/develop
Browse files Browse the repository at this point in the history
[ Change version ] 1.20.3
  • Loading branch information
kurudrive authored Dec 2, 2021
2 parents 3dccc91 + 4f1a68e commit e92ac77
Show file tree
Hide file tree
Showing 151 changed files with 36,890 additions and 13,942 deletions.
8 changes: 6 additions & 2 deletions .github/workflows/ci-test-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,11 @@ on:
push:
branches:
- master
- develop
pull_request:
branches:
- master
- develop

env:
plugin_name: vk-blocks-pro
Expand Down Expand Up @@ -39,8 +41,10 @@ jobs:

- name: Install NPM Scripts
run: npm install
- name: install Composer Package
run: composer install
- name: Install Composer Package ( no-dev )
run: composer install --no-dev
- name: Install @wordpress/env
run: npm install -g @wordpress/env
- name: Run @wordpress/env
run: npx wp-env start
- name: Install WP-CLI
Expand Down
6 changes: 6 additions & 0 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,12 @@ jobs:
php-version: 7.4
- name: Install NPM Scripts
run: npm install
- name: Install Composer Package ( no-dev )
run: composer install --no-dev
- name: Install @wordpress/env
run: npm install -g @wordpress/env
- name: Run @wordpress/env
run: wp-env start
- name: Install WP-CLI
run: |
curl -O https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar
Expand Down
9 changes: 6 additions & 3 deletions .github/workflows/php_unit_test.yml
Original file line number Diff line number Diff line change
@@ -1,19 +1,22 @@
name: PHP Unit Test

on:
push:
branches:
- master
- develop
pull_request:
branches:
- master
- develop
- ^feature/.+

jobs:
php_unit:
name: php unit test
runs-on: ubuntu-latest
strategy:
matrix:
php: [7.2, 7.3, 7.4]
php: [7.3, 7.4]
services:
mysql:
image: mysql:5.7
Expand Down Expand Up @@ -61,4 +64,4 @@ jobs:
- name: Run @wordpress/env
run: npx wp-env start
- name: PHP Unit Test
run: npm run phpunit
run: npm run phpunit
5 changes: 4 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,10 @@
}
],
"require": {
"vektor-inc/vk-color-palette-manager": "^0.0.14"
"php": ">=7.2",
"tgmpa/tgm-plugin-activation": "dev-develop",
"yahnis-elsts/plugin-update-checker": "*",
"vektor-inc/vk-color-palette-manager": "^0.0.15"
},
"require-dev": {
"php": ">=7.2",
Expand Down
Loading

0 comments on commit e92ac77

Please sign in to comment.