Skip to content

Commit 9cccc6c

Browse files
authored
Remove Symfony 6 hacks (#12)
* Remove Symfony 6 hacks * move e2e tests to independent job * fix job name
1 parent e9be902 commit 9cccc6c

File tree

3 files changed

+48
-18
lines changed

3 files changed

+48
-18
lines changed

.github/workflows/ci.yaml

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
with:
3737
php-version: ${{ matrix.php-version }}
3838
coverage: ${{ matrix.coverage-driver }}
39-
tools: composer:v2
39+
tools: composer:v2, flex
4040

4141
- name: Get composer cache directory
4242
id: composer-cache
@@ -52,25 +52,17 @@ jobs:
5252
composer-${{ runner.os }}-${{ matrix.php-version }}-
5353
composer-${{ runner.os }}-
5454
composer-
55-
56-
- name: Configure Symfony v6@dev hacks
57-
if: matrix.symfony-require == '^6'
58-
run: |
59-
composer config minimum-stability beta
55+
56+
- name: Configure Symfony Flex
57+
run: composer config extra.symfony.require ${{ matrix.symfony-require }}
6058

6159
- name: Install dependencies
6260
run: composer update --optimize-autoloader --no-interaction --no-progress --prefer-dist
6361

6462
- name: Run tests and generate coverage
6563
run: make test-unit
6664

67-
- name: Run E2E tests
68-
env:
69-
TERM: xterm-256color
70-
run: make test-e2e
71-
7265
- name: Upload coverage results to Coveralls
73-
if: matrix.symfony-require != '^6'
7466
env:
7567
COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
7668
run: vendor/bin/php-coveralls

.github/workflows/e2e-tests.yaml

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
# yamllint disable rule:line-length
2+
# yamllint disable rule:braces
3+
4+
name: E2E Tests
5+
6+
on:
7+
pull_request:
8+
push:
9+
branches:
10+
- main
11+
- master
12+
13+
jobs:
14+
tests:
15+
runs-on: ubuntu-latest
16+
17+
strategy:
18+
matrix:
19+
php-version: [ '7.4', '8.0', '8.1' ]
20+
coverage-driver: [ pcov ]
21+
22+
name: CI with PHP ${{ matrix.php-version }}, using ${{ matrix.coverage-driver }}
23+
24+
steps:
25+
- name: Checkout
26+
uses: actions/checkout@v4
27+
28+
- name: Setup PHP
29+
uses: shivammathur/setup-php@v2
30+
with:
31+
php-version: ${{ matrix.php-version }}
32+
coverage: ${{ matrix.coverage-driver }}
33+
tools: composer:v2
34+
35+
- name: Run E2E tests
36+
env:
37+
TERM: xterm-256color
38+
run: make test-e2e

composer.lock

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)