Skip to content

Commit e2262be

Browse files
committed
Update dependencies
Fix MSSQL workflow
1 parent bb15d11 commit e2262be

File tree

4 files changed

+23
-13
lines changed

4 files changed

+23
-13
lines changed

.github/workflows/main.yml

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,36 +14,45 @@ jobs:
1414
matrix:
1515
php-versions: ['8.1']
1616
steps:
17+
- name: Install ODBC driver.
18+
run: |
19+
sudo curl https://packages.microsoft.com/config/ubuntu/$(lsb_release -rs)/prod.list | sudo tee /etc/apt/sources.list.d/mssql-release.list
20+
sudo ACCEPT_EULA=Y apt-get install -y msodbcsql18
21+
1722
- name: Checkout
1823
uses: actions/checkout@v2
24+
1925
- name: Setup DB services
2026
run: |
2127
cd tests
2228
docker compose up -d
2329
cd ..
30+
2431
- name: Setup PHP ${{ matrix.php-versions }}
2532
uses: shivammathur/setup-php@v2
2633
with:
2734
php-version: ${{ matrix.php-versions }}
2835
coverage: pcov
2936
tools: pecl
3037
extensions: mbstring, pdo, pdo_sqlite, pdo_pgsql, pdo_sqlsrv, pdo_mysql
38+
3139
- name: Get Composer Cache Directory
3240
id: composer-cache
3341
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
42+
3443
- name: Restore Composer Cache
35-
uses: actions/cache@v2
44+
uses: actions/cache@v4
3645
with:
3746
path: ${{ steps.composer-cache.outputs.dir }}
3847
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
3948
restore-keys: ${{ runner.os }}-composer-
4049

4150
- name: Install dependencies with composer
42-
if: matrix.php-versions != '8.2'
51+
if: matrix.php-versions != '8.5'
4352
run: composer update --prefer-dist --no-interaction --no-progress --optimize-autoloader --ansi
4453

45-
- name: Install dependencies with composer php 8.2
46-
if: matrix.php-versions == '8.2'
54+
- name: Install dependencies with composer php 8.5
55+
if: matrix.php-versions == '8.5'
4756
run: composer update --ignore-platform-reqs --prefer-dist --no-interaction --no-progress --optimize-autoloader --ansi
4857

4958
- name: Execute Tests
@@ -67,7 +76,7 @@ jobs:
6776
runs-on: ubuntu-latest
6877
strategy:
6978
matrix:
70-
php-versions: ['8.1']
79+
php-versions: ['8.1', '8.4']
7180
steps:
7281
- name: Checkout
7382
uses: actions/checkout@v2
@@ -82,18 +91,18 @@ jobs:
8291
id: composer-cache
8392
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
8493
- name: Restore Composer Cache
85-
uses: actions/cache@v2
94+
uses: actions/cache@v4
8695
with:
8796
path: ${{ steps.composer-cache.outputs.dir }}
8897
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
8998
restore-keys: ${{ runner.os }}-composer-
9099

91100
- name: Install dependencies with composer
92-
if: matrix.php-versions != '8.1'
101+
if: matrix.php-versions != '8.5'
93102
run: composer update --prefer-dist --no-interaction --no-progress --optimize-autoloader --ansi
94103

95-
- name: Install dependencies with composer php 8.1
96-
if: matrix.php-versions == '8.1'
104+
- name: Install dependencies with composer php 8.5
105+
if: matrix.php-versions == '8.5'
97106
run: composer update --ignore-platform-reqs --prefer-dist --no-interaction --no-progress --optimize-autoloader --ansi
98107

99108
- name: Execute Tests

.github/workflows/static-analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
uses: wayofdev/gh-actions/actions/composer/[email protected]
5757

5858
- name: ♻️ Restore cached dependencies installed with composer
59-
uses: actions/cache@v4.0.2
59+
uses: actions/cache@v4
6060
with:
6161
path: ${{ env.COMPOSER_CACHE_DIR }}
6262
key: php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-${{ hashFiles('composer.lock') }}

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
"buggregator/trap": "^1.11",
1616
"mockery/mockery": "^1.5",
1717
"phpunit/phpunit": "^9.5",
18-
"spiral/code-style": "~2.2.0",
19-
"vimeo/psalm": "^5.25"
18+
"spiral/code-style": "^2.2.0",
19+
"vimeo/psalm": "^6.4"
2020
},
2121
"autoload": {
2222
"psr-4": {

tests/bootstrap.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,9 @@
4949
database: 'tempdb',
5050
host: '127.0.0.1',
5151
port: 11433,
52+
trustServerCertificate: true,
5253
user: 'SA',
53-
password: 'YourStrong!Passw0rd'
54+
password: 'YourStrong!Passw0rd',
5455
),
5556
queryCache: true
5657
),

0 commit comments

Comments
 (0)