Skip to content

Commit 908cdc6

Browse files
authored
Merge pull request #4310 from greg0ire/travis-to-gh
Migrate jobs away from Travis to Github Actions
2 parents 0533e6f + 5bf8e74 commit 908cdc6

23 files changed

+520
-423
lines changed

.github/workflows/continuous-integration.yml

Lines changed: 492 additions & 5 deletions
Large diffs are not rendered by default.

.travis.yml

Lines changed: 0 additions & 191 deletions
This file was deleted.

tests/travis/install-db2-ibm_db2.sh renamed to ci/github/ext/install-ibm_db2.sh

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ set -ex
55
echo "Installing extension"
66
(
77
# updating APT packages as per support recommendation
8-
sudo apt -y -q update
9-
sudo apt install ksh
8+
sudo apt-get -y -q update
9+
sudo apt-get install ksh php-pear
1010

1111
cd /tmp
1212

@@ -21,7 +21,6 @@ echo "Installing extension"
2121
cd ibm_db2-*
2222
phpize
2323
./configure --with-IBM_DB2=/tmp/dsdriver
24-
make -j `nproc`
25-
make install
26-
echo -e 'extension=ibm_db2.so\nibm_db2.instance_name=db2inst1' > ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/ibm_db2.ini
24+
make -j "$(nproc)"
25+
sudo make install
2726
)

tests/travis/ibm_db2.travis.xml renamed to ci/github/phpunit/ibm_db2.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@
1717

1818
<testsuites>
1919
<testsuite name="Doctrine DBAL Test Suite">
20-
<directory>../Doctrine/Tests/DBAL</directory>
20+
<directory>../../../tests</directory>
2121
</testsuite>
2222
</testsuites>
2323

2424
<coverage>
2525
<include>
26-
<directory suffix=".php">../../lib/Doctrine</directory>
26+
<directory suffix=".php">../../../lib/Doctrine</directory>
2727
</include>
2828
</coverage>
2929
</phpunit>

tests/travis/mysqli-tls.docker.travis.xml renamed to ci/github/phpunit/mysqli-tls.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<php>
1111
<var name="db_driver" value="mysqli"/>
1212
<var name="db_host" value="127.0.0.1"/>
13-
<var name="db_port" value="33306"/>
13+
<var name="db_port" value="3306"/>
1414
<var name="db_ssl_ca" value="ca.pem"/>
1515
<var name="db_ssl_cert" value="client-cert.pem"/>
1616
<var name="db_ssl_key" value="client-key.pem"/>
@@ -25,13 +25,13 @@
2525

2626
<testsuites>
2727
<testsuite name="Doctrine DBAL Test Suite">
28-
<directory>../Doctrine/Tests/DBAL</directory>
28+
<directory>../../../tests</directory>
2929
</testsuite>
3030
</testsuites>
3131

3232
<coverage>
3333
<include>
34-
<directory suffix=".php">../../lib/Doctrine</directory>
34+
<directory suffix=".php">../../../lib/Doctrine</directory>
3535
</include>
3636
</coverage>
3737
</phpunit>

tests/travis/mysqli.docker.travis.xml renamed to ci/github/phpunit/mysqli.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,20 @@
1010
<php>
1111
<var name="db_driver" value="mysqli"/>
1212
<var name="db_host" value="127.0.0.1" />
13-
<var name="db_port" value="33306"/>
13+
<var name="db_port" value="3306"/>
1414
<var name="db_user" value="root" />
1515
<var name="db_dbname" value="doctrine_tests" />
1616
</php>
1717

1818
<testsuites>
1919
<testsuite name="Doctrine DBAL Test Suite">
20-
<directory>../Doctrine/Tests/DBAL</directory>
20+
<directory>../../../tests</directory>
2121
</testsuite>
2222
</testsuites>
2323

2424
<coverage>
2525
<include>
26-
<directory suffix=".php">../../lib/Doctrine</directory>
26+
<directory suffix=".php">../../../lib/Doctrine</directory>
2727
</include>
2828
</coverage>
2929
</phpunit>

ci/github/phpunit.oci8.xml renamed to ci/github/phpunit/oci8.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@
2424

2525
<testsuites>
2626
<testsuite name="Doctrine DBAL Test Suite">
27-
<directory>../../tests</directory>
27+
<directory>../../../tests</directory>
2828
</testsuite>
2929
</testsuites>
3030

3131
<coverage>
3232
<include>
33-
<directory suffix=".php">../../lib/Doctrine</directory>
33+
<directory suffix=".php">../../../lib/Doctrine</directory>
3434
</include>
3535
</coverage>
3636
</phpunit>

tests/travis/mysql.docker.travis.xml renamed to ci/github/phpunit/pdo_mysql.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,20 @@
1010
<php>
1111
<var name="db_driver" value="pdo_mysql"/>
1212
<var name="db_host" value="127.0.0.1" />
13-
<var name="db_port" value="33306"/>
13+
<var name="db_port" value="3306"/>
1414
<var name="db_user" value="root" />
1515
<var name="db_dbname" value="doctrine_tests" />
1616
</php>
1717

1818
<testsuites>
1919
<testsuite name="Doctrine DBAL Test Suite">
20-
<directory>../Doctrine/Tests/DBAL</directory>
20+
<directory>../../../tests</directory>
2121
</testsuite>
2222
</testsuites>
2323

2424
<coverage>
2525
<include>
26-
<directory suffix=".php">../../lib/Doctrine</directory>
26+
<directory suffix=".php">../../../lib/Doctrine</directory>
2727
</include>
2828
</coverage>
2929
</phpunit>

ci/github/phpunit.pdo-oci.xml renamed to ci/github/phpunit/pdo_oci.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@
2424

2525
<testsuites>
2626
<testsuite name="Doctrine DBAL Test Suite">
27-
<directory>../../tests</directory>
27+
<directory>../../../tests</directory>
2828
</testsuite>
2929
</testsuites>
3030

3131
<coverage>
3232
<include>
33-
<directory suffix=".php">../../lib/Doctrine</directory>
33+
<directory suffix=".php">../../../lib/Doctrine</directory>
3434
</include>
3535
</coverage>
3636
</phpunit>

tests/travis/pgsql.travis.xml renamed to ci/github/phpunit/pdo_pgsql.xml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,19 @@
1111
<var name="db_driver" value="pdo_pgsql"/>
1212
<var name="db_host" value="localhost" />
1313
<var name="db_user" value="postgres" />
14+
<var name="db_password" value="postgres" />
1415
<var name="db_dbname" value="doctrine_tests" />
1516
</php>
1617

1718
<testsuites>
1819
<testsuite name="Doctrine DBAL Test Suite">
19-
<directory>../Doctrine/Tests/DBAL</directory>
20+
<directory>../../../tests</directory>
2021
</testsuite>
2122
</testsuites>
2223

2324
<coverage>
2425
<include>
25-
<directory suffix=".php">../../lib/Doctrine</directory>
26+
<directory suffix=".php">../../../lib/Doctrine</directory>
2627
</include>
2728
</coverage>
2829
</phpunit>

0 commit comments

Comments
 (0)