Skip to content

Commit a694ee1

Browse files
committed
ci: update workflow actions
1 parent c3cab76 commit a694ee1

File tree

2 files changed

+16
-47
lines changed

2 files changed

+16
-47
lines changed

.github/workflows/ci.yml

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,11 @@ jobs:
5454
strict: true
5555

5656
- name: 🛠️ Setup PHP
57-
uses: shivammathur/setup-php@2.30.2
57+
uses: shivammathur/setup-php@v2
5858
with:
5959
php-version: ${{ matrix.php-version }}
6060
extensions: mbstring, pdo, pdo_sqlite
6161
ini-values: error_reporting=E_ALL
62-
coverage: xdebug
6362

6463
- name: 🛠️ Setup problem matchers
6564
run: |
@@ -68,20 +67,10 @@ jobs:
6867
- name: 🤖 Validate composer.json and composer.lock
6968
run: composer validate --ansi --strict
7069

71-
- name: 🔍 Get composer cache directory
72-
uses: cycle/gh-actions/actions/composer/[email protected]
73-
74-
- name: ♻️ Restore cached dependencies installed with composer
75-
uses: actions/[email protected]
76-
with:
77-
path: ${{ env.COMPOSER_CACHE_DIR }}
78-
key: php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-${{ hashFiles('composer.lock') }}
79-
restore-keys: php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-
80-
81-
- name: 📥 Install "${{ matrix.dependencies }}" dependencies
82-
uses: cycle/gh-actions/actions/composer/[email protected]
70+
- name: 📥 Install dependencies with composer
71+
uses: ramsey/composer-install@v3
8372
with:
84-
dependencies: ${{ matrix.dependencies }}
73+
dependency-versions: ${{ matrix.dependencies }}
8574

8675
- name: 🔍 Run composer-normalize
8776
run: composer normalize --ansi --dry-run

.github/workflows/main.yml

Lines changed: 12 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
runs-on: ubuntu-latest
1717
strategy:
1818
matrix:
19-
php-versions: ['8.0', '8.1', '8.2', '8.3']
19+
php-versions: ['8.0', '8.1', '8.2', '8.3', '8.4']
2020
steps:
2121
- name: Install ODBC driver.
2222
run: |
@@ -37,33 +37,24 @@ jobs:
3737
coverage: pcov
3838
tools: pecl
3939
extensions: mbstring, pdo, pdo_sqlite, pdo_pgsql, pdo_sqlsrv, pdo_mysql
40-
- name: Get Composer Cache Directory
41-
id: composer-cache
42-
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
43-
- name: Restore Composer Cache
44-
uses: actions/cache@v2
45-
with:
46-
path: ${{ steps.composer-cache.outputs.dir }}
47-
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
48-
restore-keys: ${{ runner.os }}-composer-
4940

50-
- name: Install dependencies with composer
51-
if: matrix.php-versions != '8.3'
52-
run: composer update --prefer-dist --no-interaction --no-progress --optimize-autoloader --ansi
41+
- name: Validate composer.json and composer.lock
42+
run: composer validate --ansi --strict
5343

54-
- name: Install dependencies with composer php 8.3
55-
if: matrix.php-versions == '8.3'
56-
run: composer update --ignore-platform-reqs --prefer-dist --no-interaction --no-progress --optimize-autoloader --ansi
44+
- name: Install dependencies with composer
45+
uses: ramsey/composer-install@v3
5746

5847
- name: Execute Tests
5948
run: |
6049
vendor/bin/phpunit --coverage-clover=coverage.clover
50+
6151
- name: Upload coverage to Codecov
6252
continue-on-error: true # if is fork
6353
uses: codecov/codecov-action@v1
6454
with:
6555
token: ${{ secrets.CODECOV_TOKEN }}
6656
file: ./coverage.clover
57+
6758
- name: Upload coverage to Scrutinizer
6859
continue-on-error: true # if is fork
6960
uses: sudo-bot/action-scrutinizer@latest
@@ -75,7 +66,7 @@ jobs:
7566
runs-on: ubuntu-latest
7667
strategy:
7768
matrix:
78-
php-versions: ['8.0', '8.1', '8.2', '8.3']
69+
php-versions: ['8.0', '8.1', '8.2', '8.3', '8.4']
7970
steps:
8071
- name: Checkout
8172
uses: actions/checkout@v2
@@ -86,23 +77,12 @@ jobs:
8677
coverage: pcov
8778
tools: pecl
8879
extensions: mbstring, pdo, pdo_sqlite
89-
- name: Get Composer Cache Directory
90-
id: composer-cache
91-
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
92-
- name: Restore Composer Cache
93-
uses: actions/cache@v2
94-
with:
95-
path: ${{ steps.composer-cache.outputs.dir }}
96-
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
97-
restore-keys: ${{ runner.os }}-composer-
9880

99-
- name: Install dependencies with composer
100-
if: matrix.php-versions != '8.3'
101-
run: composer update --prefer-dist --no-interaction --no-progress --optimize-autoloader --ansi
81+
- name: Validate composer.json and composer.lock
82+
run: composer validate --ansi --strict
10283

103-
- name: Install dependencies with composer php 8.3
104-
if: matrix.php-versions == '8.3'
105-
run: composer update --ignore-platform-reqs --prefer-dist --no-interaction --no-progress --optimize-autoloader --ansi
84+
- name: Install dependencies with composer
85+
uses: ramsey/composer-install@v3
10686

10787
- name: Execute Tests
10888
env:

0 commit comments

Comments
 (0)