Skip to content

Commit 1fe5156

Browse files
olhalivitchukolhalivitchuk
committed
FRW-10644 Resolved conflicts
2 parents fda5cc2 + 14d5e9a commit 1fe5156

File tree

2 files changed

+117
-116
lines changed

2 files changed

+117
-116
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 116 additions & 115 deletions
Original file line numberDiff line numberDiff line change
@@ -16,120 +16,121 @@ env:
1616
DATABASE_COLLATE: utf8_general_ci
1717

1818
on:
19-
pull_request:
20-
push:
21-
branches:
22-
- master
23-
workflow_dispatch:
19+
pull_request:
20+
push:
21+
branches:
22+
- master
23+
workflow_dispatch:
2424

2525
jobs:
26-
validation:
27-
runs-on: ubuntu-latest
28-
strategy:
29-
fail-fast: false
30-
matrix:
31-
php-version: [
32-
'8.3',
33-
'8.4'
34-
]
35-
36-
steps:
37-
- uses: actions/checkout@v4
38-
39-
- uses: shogo82148/actions-setup-mysql@v1
40-
with:
41-
mysql-version: ${{ env.DATABASE_VERSION }}
42-
root-password: ${{ env.DATABASE_ROOT_PASSWORD }}
43-
user: ${{ env.DATABASE_USERNAME }}
44-
password: ${{ env.DATABASE_PASSWORD }}
45-
46-
- name: Create database
47-
run: mysql -h ${{ env.DATABASE_HOST }} -u root -p${{ env.DATABASE_ROOT_PASSWORD }} -e 'CREATE DATABASE IF NOT EXISTS `${{ env.DATABASE_NAME }}` CHARACTER SET ${{ env.DATABASE_CHARACTER_SET }} COLLATE ${{ env.DATABASE_COLLATE }};'
48-
49-
- name: Setup PHP
50-
uses: shivammathur/setup-php@v2
51-
with:
52-
php-version: ${{ matrix.php-version }}
53-
extensions: mbstring, intl, pdo_mysql
54-
55-
- name: Validate composer.json and composer.lock
56-
run: composer validate
57-
58-
- name: Get Composer Cache Directory
59-
id: composer-cache
60-
run: |
61-
echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
62-
63-
- uses: actions/cache@v4
64-
with:
65-
path: ${{ steps.composer-cache.outputs.dir }}
66-
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
67-
restore-keys: |
68-
${{ runner.os }}-composer-
69-
70-
- name: Composer install
71-
run: |
72-
composer --version
73-
composer install --optimize-autoloader
74-
75-
- name: Run tests (failing right now)
76-
run: composer test || true
77-
78-
- name: PHPStan checks
79-
run: |
80-
composer stan-setup
81-
composer stan
82-
83-
- name: CodeStyle checks
84-
run: composer cs-check
85-
86-
prefer-lowest:
87-
runs-on: ubuntu-latest
88-
strategy:
89-
fail-fast: false
90-
matrix:
91-
php-version: [
92-
'8.3'
93-
]
94-
95-
steps:
96-
- uses: actions/checkout@v4
97-
98-
- uses: shogo82148/actions-setup-mysql@v1
99-
with:
100-
mysql-version: ${{ env.DATABASE_VERSION }}
101-
root-password: ${{ env.DATABASE_ROOT_PASSWORD }}
102-
user: ${{ env.DATABASE_USERNAME }}
103-
password: ${{ env.DATABASE_PASSWORD }}
104-
105-
- name: Create database
106-
run: mysql -h ${{ env.DATABASE_HOST }} -u root -p${{ env.DATABASE_ROOT_PASSWORD }} -e 'CREATE DATABASE IF NOT EXISTS `${{ env.DATABASE_NAME }}` CHARACTER SET ${{ env.DATABASE_CHARACTER_SET }} COLLATE ${{ env.DATABASE_COLLATE }};'
107-
108-
- name: Setup PHP
109-
uses: shivammathur/setup-php@v2
110-
with:
111-
php-version: ${{ matrix.php-version }}
112-
extensions: mbstring, intl, pdo_mysql
113-
114-
- name: Get Composer Cache Directory
115-
id: composer-cache
116-
run: |
117-
echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
118-
119-
- uses: actions/cache@v4
120-
with:
121-
path: ${{ steps.composer-cache.outputs.dir }}
122-
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
123-
restore-keys: |
124-
${{ runner.os }}-composer-
125-
126-
- name: Composer prefer-lowest
127-
run: composer update --prefer-dist --no-interaction --prefer-lowest --prefer-stable -o
128-
129-
- name: Run tests (failing right now)
130-
run: composer test || true
131-
132-
- name: PHPStan checks (failing right now due to failing tests)
133-
run: |
134-
composer stan-setup
135-
composer stan || true
26+
validation:
27+
runs-on: ubuntu-latest
28+
strategy:
29+
fail-fast: false
30+
matrix:
31+
php-version: [
32+
'8.3',
33+
'8.4'
34+
]
35+
36+
steps:
37+
- uses: actions/checkout@v4
38+
39+
- uses: shogo82148/actions-setup-mysql@v1
40+
with:
41+
mysql-version: ${{ env.DATABASE_VERSION }}
42+
root-password: ${{ env.DATABASE_ROOT_PASSWORD }}
43+
user: ${{ env.DATABASE_USERNAME }}
44+
password: ${{ env.DATABASE_PASSWORD }}
45+
46+
- name: Create database
47+
run: mysql -h ${{ env.DATABASE_HOST }} -u root -p${{ env.DATABASE_ROOT_PASSWORD }} -e 'CREATE DATABASE IF NOT EXISTS `${{ env.DATABASE_NAME }}` CHARACTER SET ${{ env.DATABASE_CHARACTER_SET }} COLLATE ${{ env.DATABASE_COLLATE }};'
48+
49+
- name: Setup PHP
50+
uses: shivammathur/setup-php@v2
51+
with:
52+
php-version: ${{ matrix.php-version }}
53+
extensions: mbstring, intl, pdo_mysql
54+
55+
- name: Validate composer.json and composer.lock
56+
run: composer validate
57+
58+
- name: Get Composer Cache Directory
59+
id: composer-cache
60+
run: |
61+
echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
62+
63+
- uses: actions/cache@v3
64+
with:
65+
path: ${{ steps.composer-cache.outputs.dir }}
66+
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
67+
restore-keys: |
68+
${{ runner.os }}-composer-
69+
70+
- name: Composer install
71+
run: |
72+
composer --version
73+
composer install --optimize-autoloader
74+
75+
- name: Run tests (failing right now)
76+
run: composer test || true
77+
78+
- name: PHPStan checks
79+
run: |
80+
composer stan-setup
81+
composer stan
82+
83+
- name: CodeStyle checks
84+
run: composer cs-check
85+
86+
prefer-lowest:
87+
runs-on: ubuntu-latest
88+
strategy:
89+
fail-fast: false
90+
matrix:
91+
php-version: [
92+
'8.3'
93+
]
94+
95+
steps:
96+
- uses: actions/checkout@v4
97+
98+
- uses: shogo82148/actions-setup-mysql@v1
99+
with:
100+
mysql-version: ${{ env.DATABASE_VERSION }}
101+
root-password: ${{ env.DATABASE_ROOT_PASSWORD }}
102+
user: ${{ env.DATABASE_USERNAME }}
103+
password: ${{ env.DATABASE_PASSWORD }}
104+
105+
- name: Create database
106+
run: mysql -h ${{ env.DATABASE_HOST }} -u root -p${{ env.DATABASE_ROOT_PASSWORD }} -e 'CREATE DATABASE IF NOT EXISTS `${{ env.DATABASE_NAME }}` CHARACTER SET ${{ env.DATABASE_CHARACTER_SET }} COLLATE ${{ env.DATABASE_COLLATE }};'
107+
108+
109+
- name: Setup PHP
110+
uses: shivammathur/setup-php@v2
111+
with:
112+
php-version: ${{ matrix.php-version }}
113+
extensions: mbstring, intl, pdo_mysql
114+
115+
- name: Get Composer Cache Directory
116+
id: composer-cache
117+
run: |
118+
echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
119+
120+
- uses: actions/cache@v3
121+
with:
122+
path: ${{ steps.composer-cache.outputs.dir }}
123+
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
124+
restore-keys: |
125+
${{ runner.os }}-composer-
126+
127+
- name: Composer prefer-lowest
128+
run: composer update --prefer-dist --no-interaction --prefer-lowest --prefer-stable -o
129+
130+
- name: Run tests (failing right now)
131+
run: composer test || true
132+
133+
- name: PHPStan checks (failing right now due to failing tests)
134+
run: |
135+
composer stan-setup
136+
composer stan || true

‎composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
},
1818
"require-dev": {
1919
"codeception/module-asserts": "^3.0.0",
20-
"phpunit/phpunit": "^9.0.0",
20+
"phpunit/phpunit": "^12.1.0",
2121
"spryker/application": "*",
2222
"spryker/code-sniffer": "^0.17.1",
2323
"spryker/config": "^3.5.0",

0 commit comments

Comments
 (0)