Skip to content

Commit 2caad21

Browse files
mvorisekmvorisek
authored
Add Oracle v23 to CI testing (#6217)
| Q | A |------------- | ----------- | Type | improvement | Fixed issues | n/a #### Summary Latest Oracle database compatibility should be tested. Targetting lowest open branch to assert the compatibility for 3.7.x too for possible bugfixes.
1 parent 1f1aad9 commit 2caad21

File tree

5 files changed

+88
-8
lines changed

5 files changed

+88
-8
lines changed

‎.github/workflows/continuous-integration.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -111,13 +111,14 @@ jobs:
111111
- "8.3"
112112
oracle-version:
113113
- "21"
114+
- "23"
114115
include:
115116
- php-version: "7.4"
116117
oracle-version: "11"
117118

118119
services:
119120
oracle:
120-
image: gvenzl/oracle-xe:${{ matrix.oracle-version }}
121+
image: gvenzl/oracle-${{ matrix.oracle-version < 23 && 'xe' || 'free' }}:${{ matrix.oracle-version }}
121122
env:
122123
ORACLE_PASSWORD: oracle
123124
ports:
@@ -148,7 +149,7 @@ jobs:
148149
composer-options: "--ignore-platform-req=php+"
149150

150151
- name: "Run PHPUnit"
151-
run: "vendor/bin/phpunit -c ci/github/phpunit/oci8.xml --coverage-clover=coverage.xml"
152+
run: "vendor/bin/phpunit -c ci/github/phpunit/oci8${{ matrix.oracle-version < 23 && '-21' || '' }}.xml --coverage-clover=coverage.xml"
152153

153154
- name: "Upload coverage file"
154155
uses: "actions/upload-artifact@v3"
@@ -169,13 +170,14 @@ jobs:
169170
- "8.3"
170171
oracle-version:
171172
- "21"
173+
- "23"
172174
include:
173175
- php-version: "7.4"
174176
oracle-version: "11"
175177

176178
services:
177179
oracle:
178-
image: gvenzl/oracle-xe:${{ matrix.oracle-version }}
180+
image: gvenzl/oracle-${{ matrix.oracle-version < 23 && 'xe' || 'free' }}:${{ matrix.oracle-version }}
179181
env:
180182
ORACLE_PASSWORD: oracle
181183
ports:
@@ -206,7 +208,7 @@ jobs:
206208
composer-options: "--ignore-platform-req=php+"
207209

208210
- name: "Run PHPUnit"
209-
run: "vendor/bin/phpunit -c ci/github/phpunit/pdo_oci.xml --coverage-clover=coverage.xml"
211+
run: "vendor/bin/phpunit -c ci/github/phpunit/pdo_oci${{ matrix.oracle-version < 23 && '-21' || '' }}.xml --coverage-clover=coverage.xml"
210212

211213
- name: "Upload coverage file"
212214
uses: "actions/upload-artifact@v3"

‎ci/github/phpunit/oci8-21.xml

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:noNamespaceSchemaLocation="../../../vendor/phpunit/phpunit/phpunit.xsd"
4+
colors="true"
5+
beStrictAboutOutputDuringTests="true"
6+
beStrictAboutTodoAnnotatedTests="true"
7+
failOnRisky="true"
8+
failOnWarning="true"
9+
convertDeprecationsToExceptions="true"
10+
>
11+
<php>
12+
<ini name="error_reporting" value="-1" />
13+
14+
<var name="db_driver" value="oci8"/>
15+
<var name="db_host" value="localhost"/>
16+
<var name="db_user" value="doctrine"/>
17+
<var name="db_password" value="oracle"/>
18+
<var name="db_dbname" value="XE"/>
19+
<var name="db_charset" value="AL32UTF8" />
20+
21+
<var name="tmpdb_driver" value="oci8"/>
22+
<var name="tmpdb_host" value="localhost"/>
23+
<var name="tmpdb_user" value="system"/>
24+
<var name="tmpdb_password" value="oracle"/>
25+
<var name="tmpdb_dbname" value="XE"/>
26+
</php>
27+
28+
<testsuites>
29+
<testsuite name="Doctrine DBAL Test Suite">
30+
<directory>../../../tests</directory>
31+
</testsuite>
32+
</testsuites>
33+
34+
<coverage>
35+
<include>
36+
<directory suffix=".php">../../../src</directory>
37+
</include>
38+
</coverage>
39+
</phpunit>

‎ci/github/phpunit/oci8.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@
1515
<var name="db_host" value="localhost"/>
1616
<var name="db_user" value="doctrine"/>
1717
<var name="db_password" value="oracle"/>
18-
<var name="db_dbname" value="XE"/>
18+
<var name="db_dbname" value="FREE"/>
1919
<var name="db_charset" value="AL32UTF8" />
2020

2121
<var name="tmpdb_driver" value="oci8"/>
2222
<var name="tmpdb_host" value="localhost"/>
2323
<var name="tmpdb_user" value="system"/>
2424
<var name="tmpdb_password" value="oracle"/>
25-
<var name="tmpdb_dbname" value="XE"/>
25+
<var name="tmpdb_dbname" value="FREE"/>
2626
</php>
2727

2828
<testsuites>

‎ci/github/phpunit/pdo_oci-21.xml

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:noNamespaceSchemaLocation="../../../vendor/phpunit/phpunit/phpunit.xsd"
4+
colors="true"
5+
beStrictAboutOutputDuringTests="true"
6+
beStrictAboutTodoAnnotatedTests="true"
7+
failOnRisky="true"
8+
failOnWarning="true"
9+
convertDeprecationsToExceptions="true"
10+
>
11+
<php>
12+
<ini name="error_reporting" value="-1" />
13+
14+
<var name="db_driver" value="pdo_oci"/>
15+
<var name="db_host" value="localhost"/>
16+
<var name="db_user" value="doctrine"/>
17+
<var name="db_password" value="oracle"/>
18+
<var name="db_dbname" value="XE"/>
19+
<var name="db_charset" value="AL32UTF8" />
20+
21+
<var name="tmpdb_driver" value="pdo_oci"/>
22+
<var name="tmpdb_host" value="localhost"/>
23+
<var name="tmpdb_user" value="system"/>
24+
<var name="tmpdb_password" value="oracle"/>
25+
<var name="tmpdb_dbname" value="XE"/>
26+
</php>
27+
28+
<testsuites>
29+
<testsuite name="Doctrine DBAL Test Suite">
30+
<directory>../../../tests</directory>
31+
</testsuite>
32+
</testsuites>
33+
34+
<coverage>
35+
<include>
36+
<directory suffix=".php">../../../src</directory>
37+
</include>
38+
</coverage>
39+
</phpunit>

‎ci/github/phpunit/pdo_oci.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@
1515
<var name="db_host" value="localhost"/>
1616
<var name="db_user" value="doctrine"/>
1717
<var name="db_password" value="oracle"/>
18-
<var name="db_dbname" value="XE"/>
18+
<var name="db_dbname" value="FREE"/>
1919
<var name="db_charset" value="AL32UTF8" />
2020

2121
<var name="tmpdb_driver" value="pdo_oci"/>
2222
<var name="tmpdb_host" value="localhost"/>
2323
<var name="tmpdb_user" value="system"/>
2424
<var name="tmpdb_password" value="oracle"/>
25-
<var name="tmpdb_dbname" value="XE"/>
25+
<var name="tmpdb_dbname" value="FREE"/>
2626
</php>
2727

2828
<testsuites>

0 commit comments

Comments
 (0)