Skip to content

Commit 881bb10

Browse files
authored
Merge pull request #210 from dshanske/depends2022
Update Composer/GitHub Actions to Latest
2 parents f9027aa + aaf089a commit 881bb10

File tree

5 files changed

+24
-30
lines changed

5 files changed

+24
-30
lines changed

.github/workflows/deploy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
name: New tag
99
runs-on: ubuntu-latest
1010
steps:
11-
- uses: actions/checkout@master
11+
- uses: actions/checkout@v3
1212
- name: WordPress Plugin Deploy
1313
uses: 10up/action-wordpress-plugin-deploy@stable
1414
env:

.github/workflows/phpcs.yml

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,26 +5,15 @@ jobs:
55
runs-on: ubuntu-latest
66
steps:
77
- name: Checkout
8-
uses: actions/checkout@v2
8+
uses: actions/checkout@v3
99
- name: Setup PHP
1010
uses: shivammathur/setup-php@v2
1111
with:
1212
php-version: '7.4'
1313
coverage: none
1414
tools: composer, cs2pr
15-
- name: Get Composer cache directory
16-
id: composer-cache
17-
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
18-
- name: Setup cache
19-
uses: pat-s/always-upload-cache@v1.1.4
20-
with:
21-
path: ${{ steps.composer-cache.outputs.dir }}
22-
# Use the hash of composer.json as the key for your cache if you do not commit composer.lock.
23-
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
24-
#key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
25-
restore-keys: ${{ runner.os }}-composer-
26-
- name: Install dependencies
27-
run: composer install --prefer-dist --no-progress
15+
- name: Install Composer dependencies for PHP
16+
uses: "ramsey/composer-install@v2"
2817
- name: Detect coding standard violations
2918
run: composer lint
3019

.github/workflows/phpunit.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,22 +15,22 @@ jobs:
1515
options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=10s --health-retries=10
1616
strategy:
1717
matrix:
18-
php-versions: ['5.6', '7.2', '7.3', '7.4']
18+
php-versions: ['5.6', '7.2', '7.3', '7.4', '8.0']
1919
steps:
2020
- name: Checkout
21-
uses: actions/checkout@v2
21+
uses: actions/checkout@v3
2222
- name: Setup PHP
2323
uses: shivammathur/setup-php@v2
2424
with:
2525
php-version: ${{ matrix.php-versions }}
2626
coverage: none
27-
tools: composer, phpunit-polyfills
27+
tools: composer, , phpunit-polyfills
2828
extensions: mysql
29-
- name: Install Composer dependencies for PHP
30-
uses: "ramsey/composer-install@v1"
31-
- name: Setup Test Environment
32-
run: composer setup-local-tests
33-
- name: Unit Testing
34-
run: composer phpunit
35-
env:
36-
PHP_VERSION: ${{ matrix.php-versions }}
29+
- name: Install Composer dependencies for PHP
30+
uses: "ramsey/composer-install@v2"
31+
- name: Setup Test Environment
32+
run: composer setup-local-tests
33+
- name: Unit Testing
34+
run: composer phpunit
35+
env:
36+
PHP_VERSION: ${{ matrix.php-versions }}

.github/workflows/update-assets.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
name: Push to trunk
99
runs-on: ubuntu-latest
1010
steps:
11-
- uses: actions/checkout@master
11+
- uses: actions/checkout@v3
1212
- name: WordPress.org plugin asset/readme update
1313
uses: 10up/action-wordpress-plugin-asset-update@master
1414
env:

composer.json

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,13 @@
33
"description": "IndieWeb for WordPress!",
44
"require": {
55
"php": ">=5.6.0",
6-
"composer/installers": "~2.1"
6+
"composer/installers": "^1.0 | ^2.1"
7+
},
8+
"config": {
9+
"allow-plugins": {
10+
"composer/installers": true,
11+
"dealerdirect/phpcodesniffer-composer-installer": true
12+
}
713
},
814
"extra": {
915
"installer-name": "indieweb"
@@ -30,10 +36,9 @@
3036
"phpcompatibility/php-compatibility": "*",
3137
"wp-coding-standards/wpcs": "*",
3238
"phpcompatibility/phpcompatibility-wp": "*",
33-
"php-parallel-lint/php-parallel-lint": "^1.2",
39+
"php-parallel-lint/php-parallel-lint": "^1.3",
3440
"wp-cli/i18n-command": "^2.2",
3541
"sebastian/phpcpd": "^3.0 || ^5.0 || ^6.0",
36-
"phpunit/phpunit": "^5.7.21 || ^6.0 || ^7.5",
3742
"yoast/phpunit-polyfills": "^1.0"
3843
},
3944
"prefer-stable" : true,

0 commit comments

Comments
 (0)