Skip to content

Commit 14d52de

Browse files
committed
ci: simplify
1 parent bd64f4d commit 14d52de

File tree

2 files changed

+19
-35
lines changed

2 files changed

+19
-35
lines changed
Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,35 @@
1-
name: "Continuous Integration"
1+
name: Continuous Integration
22

33
on:
44
push:
55
branches:
66
- master
7-
- 11.x
7+
- '*.x'
88
pull_request:
99
schedule:
1010
- cron: '0 0 * * *'
1111

1212
jobs:
13-
phpunit:
13+
tests:
1414

1515
runs-on: ubuntu-latest
1616

1717
strategy:
1818
fail-fast: true
1919
matrix:
20-
php: [8.2, 8.3, 8.4]
21-
stability: [prefer-stable]
20+
php: [ 8.2, 8.3, 8.4 ]
21+
stability: [ prefer-stable ]
2222

23-
name: PHP ${{ matrix.php }} - ${{ matrix.stability }}
23+
name: PHP ${{ matrix.php }} - STABILITY ${{ matrix.stability }}
2424

2525
steps:
2626
- name: Checkout code
27-
uses: actions/checkout@v4
27+
uses: actions/checkout@v2
2828

2929
- name: Setup PHP
3030
uses: shivammathur/setup-php@v2
3131
with:
3232
php-version: ${{ matrix.php }}
33-
extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, gd, memcached
3433
tools: composer:v2
3534
coverage: none
3635

@@ -42,7 +41,7 @@ jobs:
4241
with:
4342
timeout_minutes: 5
4443
max_attempts: 5
45-
command: COMPOSER_ROOT_VERSION=dev-master composer update --${{ matrix.stability }} --prefer-dist --no-interaction --no-progress
44+
command: composer update --${{ matrix.stability }} --prefer-dist --no-interaction --no-progress
4645

4746
- name: Execute tests
48-
run: vendor/bin/phpunit
47+
run: vendor/bin/pest

.github/workflows/static-analysis.yml

Lines changed: 10 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,39 @@
1-
name: "Static Analysis"
1+
name: Static Analysis
22

33
on:
44
push:
5-
paths:
6-
- .github/workflows/static-analysis.yml
7-
- composer.*
8-
- phpstan.neon.dist
9-
- src/**
10-
- tests/**
5+
branches:
6+
- master
7+
- '*.x'
118

129
pull_request:
13-
paths:
14-
- .github/workflows/static-analysis.yml
15-
- composer.*
16-
- phpstan.neon.dist
17-
- src/**
18-
- tests/**
1910

2011
schedule:
2112
- cron: '0 0 * * *'
2213

2314
jobs:
2415
static-analysis-phpstan:
2516

26-
name: "Static Analysis with PHPStan"
17+
name: Source Code
2718
runs-on: ubuntu-latest
2819

29-
strategy:
30-
fail-fast: true
31-
matrix:
32-
php: [8.2, 8.3, 8.4]
33-
stability: [prefer-stable]
34-
3520
steps:
3621
- name: Checkout code
3722
uses: actions/checkout@v4
3823

3924
- name: Setup PHP
4025
uses: shivammathur/setup-php@v2
4126
with:
42-
php-version: ${{ matrix.php }}
27+
php-version: 8.2
4328
tools: composer:v2
4429
coverage: none
4530

4631
- name: Install dependencies
47-
uses: nick-invision/retry@v1
32+
uses: nick-fields/retry@v3
4833
with:
4934
timeout_minutes: 5
5035
max_attempts: 5
51-
command: COMPOSER_ROOT_VERSION=dev-master composer update --${{ matrix.stability }} --prefer-dist --no-interaction --no-progress
36+
command: composer update --prefer-stable --prefer-dist --no-interaction --no-progress
5237

53-
- name: "Run a static analysis with phpstan/phpstan"
54-
run: "vendor/bin/phpstan --error-format=table"
38+
- name: Run Static Analysis
39+
run: vendor/bin/phpunit

0 commit comments

Comments
 (0)