Skip to content

Commit d228302

Browse files
authored
Merge pull request #77 from Codeception/use-configuration-outputdir
Use Configuration::outputDir()
2 parents 7650e49 + 13ecfeb commit d228302

File tree

2 files changed

+42
-7
lines changed

2 files changed

+42
-7
lines changed

.github/workflows/main.yml

Lines changed: 41 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545

4646
strategy:
4747
matrix:
48-
php: [5.6, 7.0, 7.1, 7.2, 7.3, 7.4, 8.0]
48+
php: [5.6, 7.0, 7.1, 7.2, 7.3, 7.4, 8.0, 8.1]
4949

5050
steps:
5151
- name: Checkout code
@@ -64,8 +64,8 @@ jobs:
6464

6565
- name: Install dependencies
6666
run: |
67-
composer require codeception/codeception:"^4.1" --dev --prefer-source
68-
composer require codeception/module-filesystem codeception/module-cli codeception/module-asserts codeception/module-phpbrowser --dev
67+
composer require codeception/codeception:"4.1.x-dev" --dev --prefer-source
68+
composer require codeception/module-filesystem:"^1.0" codeception/module-cli:"^1.0" codeception/module-asserts:"^1.0|^2.0" codeception/module-phpbrowser:"^1.0" --dev
6969
cp c3.php vendor/codeception/codeception/tests/data/claypit
7070
7171
- name: Start PHP Server
@@ -80,7 +80,7 @@ jobs:
8080

8181
strategy:
8282
matrix:
83-
php: [7.2, 7.3, 7.4, 8.0]
83+
php: [7.2, 7.3, 7.4, 8.0, 8.1]
8484

8585
steps:
8686
- name: Checkout code
@@ -99,8 +99,8 @@ jobs:
9999

100100
- name: Install dependencies
101101
run: |
102-
composer require codeception/codeception:"^4.1" --dev --prefer-source
103-
composer require codeception/module-filesystem codeception/module-cli codeception/module-asserts codeception/module-phpbrowser --dev
102+
composer require codeception/codeception:"4.1.x-dev" --dev --prefer-source
103+
composer require codeception/module-filesystem:"^1.0" codeception/module-cli:"^1.0" codeception/module-asserts:"^1.0|^2.0" codeception/module-phpbrowser:"^1.0" --dev
104104
cp c3.php vendor/codeception/codeception/tests/data/claypit
105105
106106
- name: Start PHP Server
@@ -109,3 +109,38 @@ jobs:
109109
110110
- name: Run test suite
111111
run: cd vendor/codeception/codeception && php ./codecept run coverage
112+
113+
codeception5:
114+
runs-on: ubuntu-latest
115+
116+
strategy:
117+
matrix:
118+
php: [8.0, 8.1]
119+
120+
steps:
121+
- name: Checkout code
122+
uses: actions/checkout@v2
123+
124+
- name: Setup PHP
125+
uses: shivammathur/setup-php@v2
126+
with:
127+
php-version: ${{ matrix.php }}
128+
129+
- name: Use Composer v2
130+
run: composer self-update --2
131+
132+
- name: Validate composer.json
133+
run: composer validate
134+
135+
- name: Install dependencies
136+
run: |
137+
composer require codeception/codeception:"5.0.x-dev as 5.0.0" --dev --prefer-source
138+
composer require codeception/module-filesystem:"^3.0" codeception/module-cli:"^2.0" codeception/module-asserts:"^3.0" codeception/module-phpbrowser:"^3.0" --dev
139+
cp c3.php vendor/codeception/codeception/tests/data/claypit
140+
141+
- name: Start PHP Server
142+
run: |
143+
cd vendor/codeception/codeception && php -S 127.0.0.1:8008 -t tests/data/app -d pcov.directory=$(pwd)/tests/data/app >/dev/null 2>&1 &
144+
145+
- name: Run test suite
146+
run: cd vendor/codeception/codeception && php ./codecept run coverage

c3.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ class_alias('PHPUnit\Runner\Version', 'PHPUnit_Runner_Version');
121121
ini_set('memory_limit', $requiredMemory);
122122
}
123123

124-
define('C3_CODECOVERAGE_MEDIATE_STORAGE', Codeception\Configuration::logDir() . 'c3tmp');
124+
define('C3_CODECOVERAGE_MEDIATE_STORAGE', Codeception\Configuration::outputDir() . 'c3tmp');
125125
define('C3_CODECOVERAGE_PROJECT_ROOT', Codeception\Configuration::projectDir());
126126
define('C3_CODECOVERAGE_TESTNAME', $_SERVER['HTTP_X_CODECEPTION_CODECOVERAGE']);
127127

0 commit comments

Comments
 (0)