Skip to content

Commit

Permalink
Merge pull request #95 from 10up/chore/composer-update
Browse files Browse the repository at this point in the history
Composer packages update
  • Loading branch information
felipeelia authored Feb 6, 2024
2 parents 6f496fd + af0dae0 commit 5f971cb
Show file tree
Hide file tree
Showing 19 changed files with 555 additions and 317 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ jobs:
- name: Set PHP version
uses: shivammathur/setup-php@v2
with:
php-version: '8.0'
php-version: '8.2'
tools: cs2pr
coverage: none

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
- name: Setup Elasticsearch
uses: getong/[email protected]
with:
elasticsearch version: '7.5.0'
elasticsearch version: '7.10.1'

- name: Set standard 10up cache directories
run: |
Expand All @@ -56,7 +56,7 @@ jobs:
- name: Set PHP version
uses: shivammathur/setup-php@v2
with:
php-version: '7.4'
php-version: '8.2'
coverage: none

- name: Install dependencies
Expand Down
9 changes: 9 additions & 0 deletions bin/build-elasticpress.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#!/bin/bash

if [ $COMPOSER_DEV_MODE == 1 ]; then
cd vendor/elasticpress
composer install
npm pkg set scripts.prepare=" "
npm ci
npm run build
fi
15 changes: 10 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,16 +29,21 @@
"require-dev": {
"phpunit/phpunit": "^9",
"10up/wp_mock": "dev-trunk",
"10up/phpcs-composer": "dev-master",
"10up/elasticpress": "*",
"10up/phpcs-composer": "^3.0",
"10up/elasticpress": "dev-develop",
"yoast/phpunit-polyfills": "^1.0",
"wpackagist-plugin/woocommerce": "*"
"wpackagist-plugin/woocommerce": "*",
"phpcompatibility/phpcompatibility-wp": "*",
"phpcompatibility/php-compatibility": "dev-develop as 9.99.99"
},
"scripts": {
"lint": "phpcs . --runtime-set testVersion 7.0-",
"lint": "phpcs . -s --runtime-set testVersion 7.0-",
"lint-fix": "phpcbf . --runtime-set testVersion 7.0-",
"test": "phpunit",
"setup-local-tests": "bash bin/install-wp-tests.sh epl_wp_test root password 127.0.0.1 latest true"
"setup-local-tests": "bash bin/install-wp-tests.sh epl_wp_test root password 127.0.0.1 latest true",
"post-autoload-dump": [
"./bin/build-elasticpress.sh"
]
},
"extra": {
"installer-paths": {
Expand Down
Loading

0 comments on commit 5f971cb

Please sign in to comment.