Skip to content

D
doctrine-dbal
Unverified Commit 8ed87e16 authored by Grégoire Paris's avatar Grégoire Paris
Browse files
Options

Use Docker consistently 

When a Docker version of the build is available, use it.
parent 514dddd8
Hide whitespace changes
Inline Side-by-side
Showing with 40 additions and 214 deletions
.travis.yml
View file @ 8ed87e16
...@@ -69,14 +69,18 @@ jobs: ...@@ -69,14 +69,18 @@ jobs:
- bash ./tests/travis/install-mysql-8.0.sh - bash ./tests/travis/install-mysql-8.0.sh
- stage: Test - stage: Test
php: 7.2 php: 7.2
env: DB=mariadb MARIADB_VERSION=10.3 env: DB=mariadb.docker MARIADB_VERSION=10.3
addons: services:
mariadb: 10.3 - docker
before_script:
- bash ./tests/travis/install-mariadb.sh
- stage: Test - stage: Test
php: 7.2 php: 7.2
env: DB=mariadb.mysqli MARIADB_VERSION=10.3 env: DB=mariadb.mysqli.docker MARIADB_VERSION=10.3
addons: services:
mariadb: 10.3 - docker
before_script:
- bash ./tests/travis/install-mariadb.sh
- stage: Test - stage: Test
php: 7.2 php: 7.2
env: DB=pgsql POSTGRESQL_VERSION=11.0 env: DB=pgsql POSTGRESQL_VERSION=11.0
...@@ -108,11 +112,6 @@ jobs: ...@@ -108,11 +112,6 @@ jobs:
- bash ./tests/travis/install-sqlsrv-dependencies.sh - bash ./tests/travis/install-sqlsrv-dependencies.sh
- bash ./tests/travis/install-mssql-pdo_sqlsrv.sh - bash ./tests/travis/install-mssql-pdo_sqlsrv.sh
- bash ./tests/travis/install-mssql.sh - bash ./tests/travis/install-mssql.sh
- stage: Test
php: 7.3
env: DB=mysql COVERAGE=yes
services:
- mysql
- stage: Test - stage: Test
php: 7.3 php: 7.3
env: DB=mysql.docker MYSQL_VERSION=5.7 COVERAGE=yes env: DB=mysql.docker MYSQL_VERSION=5.7 COVERAGE=yes
...@@ -127,11 +126,6 @@ jobs: ...@@ -127,11 +126,6 @@ jobs:
- docker - docker
before_script: before_script:
- bash ./tests/travis/install-mysql-8.0.sh - bash ./tests/travis/install-mysql-8.0.sh
- stage: Test
php: 7.3
env: DB=mysqli COVERAGE=yes
services:
- mysql
- stage: Test - stage: Test
php: 7.3 php: 7.3
env: DB=mysqli.docker MYSQL_VERSION=5.7 COVERAGE=yes env: DB=mysqli.docker MYSQL_VERSION=5.7 COVERAGE=yes
...@@ -155,14 +149,18 @@ jobs: ...@@ -155,14 +149,18 @@ jobs:
- bash ./tests/travis/install-mariadb.sh - bash ./tests/travis/install-mariadb.sh
- stage: Test - stage: Test
php: 7.3 php: 7.3
env: DB=mariadb MARIADB_VERSION=10.2 COVERAGE=yes env: DB=mariadb.docker MARIADB_VERSION=10.2 COVERAGE=yes
addons: services:
mariadb: 10.2 - docker
before_script:
- bash ./tests/travis/install-mariadb.sh
- stage: Test - stage: Test
php: 7.3 php: 7.3
env: DB=mariadb MARIADB_VERSION=10.3 COVERAGE=yes env: DB=mariadb.docker MARIADB_VERSION=10.3 COVERAGE=yes
addons: services:
mariadb: 10.3 - docker
before_script:
- bash ./tests/travis/install-mariadb.sh
- stage: Test - stage: Test
php: 7.3 php: 7.3
env: DB=mariadb.mysqli.docker MARIADB_VERSION=10.1 COVERAGE=yes env: DB=mariadb.mysqli.docker MARIADB_VERSION=10.1 COVERAGE=yes
...@@ -172,14 +170,18 @@ jobs: ...@@ -172,14 +170,18 @@ jobs:
- bash ./tests/travis/install-mariadb.sh - bash ./tests/travis/install-mariadb.sh
- stage: Test - stage: Test
php: 7.3 php: 7.3
env: DB=mariadb.mysqli MARIADB_VERSION=10.2 COVERAGE=yes env: DB=mariadb.mysqli.docker MARIADB_VERSION=10.2 COVERAGE=yes
addons: services:
mariadb: 10.2 - docker
before_script:
- bash ./tests/travis/install-mariadb.sh
- stage: Test - stage: Test
php: 7.3 php: 7.3
env: DB=mariadb.mysqli MARIADB_VERSION=10.3 COVERAGE=yes env: DB=mariadb.mysqli.docker MARIADB_VERSION=10.3 COVERAGE=yes
addons: services:
mariadb: 10.3 - docker
before_script:
- bash ./tests/travis/install-mariadb.sh
- stage: Test - stage: Test
php: 7.3 php: 7.3
env: DB=pgsql POSTGRESQL_VERSION=9.4 COVERAGE=yes env: DB=pgsql POSTGRESQL_VERSION=9.4 COVERAGE=yes
...@@ -263,14 +265,18 @@ jobs: ...@@ -263,14 +265,18 @@ jobs:
- bash ./tests/travis/install-mysql-8.0.sh - bash ./tests/travis/install-mysql-8.0.sh
- stage: Test - stage: Test
php: 7.4snapshot php: 7.4snapshot
env: DB=mariadb MARIADB_VERSION=10.3 env: DB=mariadb.docker MARIADB_VERSION=10.3
addons: services:
mariadb: 10.3 - docker
before_script:
- bash ./tests/travis/install-mariadb.sh
- stage: Test - stage: Test
php: 7.4snapshot php: 7.4snapshot
env: DB=mariadb.mysqli MARIADB_VERSION=10.3 env: DB=mariadb.mysqli.docker MARIADB_VERSION=10.3
addons: services:
mariadb: 10.3 - docker
before_script:
- bash ./tests/travis/install-mariadb.sh
- stage: Test - stage: Test
php: 7.4snapshot php: 7.4snapshot
env: DB=pgsql POSTGRESQL_VERSION=11.0 env: DB=pgsql POSTGRESQL_VERSION=11.0
......
tests/travis/mariadb.mysqli.travis.xml deleted 100644 → 0
View file @ 514dddd8
<?xml version="1.0" encoding="utf-8"?>
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="../../vendor/phpunit/phpunit/phpunit.xsd"
colors="true"
beStrictAboutOutputDuringTests="true"
beStrictAboutTodoAnnotatedTests="true"
failOnRisky="true"
failOnWarning="true"
>
<php>
<ini name="error_reporting" value="-1" />
<var name="db_type" value="mysqli"/>
<var name="db_host" value="localhost" />
<var name="db_username" value="travis" />
<var name="db_password" value="" />
<var name="db_name" value="doctrine_tests" />
<var name="db_port" value="3306"/>
<var name="tmpdb_type" value="mysqli"/>
<var name="tmpdb_host" value="localhost" />
<var name="tmpdb_username" value="travis" />
<var name="tmpdb_password" value="" />
<var name="tmpdb_port" value="3306"/>
</php>
<testsuites>
<testsuite name="Doctrine DBAL Test Suite">
<directory>../Doctrine/Tests/DBAL</directory>
</testsuite>
</testsuites>
<filter>
<whitelist>
<directory suffix=".php">../../lib/Doctrine</directory>
</whitelist>
</filter>
<groups>
<exclude>
<group>performance</group>
<group>locking_functional</group>
</exclude>
</groups>
</phpunit>
tests/travis/mariadb.travis.xml deleted 100644 → 0
View file @ 514dddd8
<?xml version="1.0" encoding="utf-8"?>
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="../../vendor/phpunit/phpunit/phpunit.xsd"
colors="true"
beStrictAboutOutputDuringTests="true"
beStrictAboutTodoAnnotatedTests="true"
failOnRisky="true"
failOnWarning="true"
>
<php>
<ini name="error_reporting" value="-1" />
<var name="db_type" value="pdo_mysql"/>
<var name="db_host" value="localhost" />
<var name="db_username" value="travis" />
<var name="db_password" value="" />
<var name="db_name" value="doctrine_tests" />
<var name="db_port" value="3306"/>
<var name="tmpdb_type" value="pdo_mysql"/>
<var name="tmpdb_host" value="localhost" />
<var name="tmpdb_username" value="travis" />
<var name="tmpdb_password" value="" />
<var name="tmpdb_port" value="3306"/>
</php>
<testsuites>
<testsuite name="Doctrine DBAL Test Suite">
<directory>../Doctrine/Tests/DBAL</directory>
</testsuite>
</testsuites>
<filter>
<whitelist>
<directory suffix=".php">../../lib/Doctrine</directory>
</whitelist>
</filter>
<groups>
<exclude>
<group>performance</group>
<group>locking_functional</group>
</exclude>
</groups>
</phpunit>
tests/travis/mysql.travis.xml deleted 100644 → 0
View file @ 514dddd8
<?xml version="1.0" encoding="utf-8"?>
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="../../vendor/phpunit/phpunit/phpunit.xsd"
colors="true"
beStrictAboutOutputDuringTests="true"
beStrictAboutTodoAnnotatedTests="true"
failOnRisky="true"
failOnWarning="true"
>
<php>
<ini name="error_reporting" value="-1" />
<var name="db_type" value="pdo_mysql"/>
<var name="db_host" value="localhost" />
<var name="db_username" value="travis" />
<var name="db_password" value="" />
<var name="db_name" value="doctrine_tests" />
<var name="db_port" value="3306"/>
<var name="tmpdb_type" value="pdo_mysql"/>
<var name="tmpdb_host" value="localhost" />
<var name="tmpdb_username" value="travis" />
<var name="tmpdb_password" value="" />
<var name="tmpdb_port" value="3306"/>
</php>
<testsuites>
<testsuite name="Doctrine DBAL Test Suite">
<directory>../Doctrine/Tests/DBAL</directory>
</testsuite>
</testsuites>
<filter>
<whitelist>
<directory suffix=".php">../../lib/Doctrine</directory>
</whitelist>
</filter>
<groups>
<exclude>
<group>performance</group>
<group>locking_functional</group>
</exclude>
</groups>
</phpunit>
tests/travis/mysqli.travis.xml deleted 100644 → 0
View file @ 514dddd8
<?xml version="1.0" encoding="utf-8"?>
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="../../vendor/phpunit/phpunit/phpunit.xsd"
colors="true"
beStrictAboutOutputDuringTests="true"
beStrictAboutTodoAnnotatedTests="true"
failOnRisky="true"
failOnWarning="true"
>
<php>
<ini name="error_reporting" value="-1" />
<var name="db_type" value="mysqli"/>
<var name="db_host" value="localhost" />
<var name="db_username" value="travis" />
<var name="db_password" value="" />
<var name="db_name" value="doctrine_tests" />
<var name="db_port" value="3306"/>
<var name="tmpdb_type" value="mysqli"/>
<var name="tmpdb_host" value="localhost" />
<var name="tmpdb_username" value="travis" />
<var name="tmpdb_password" value="" />
<var name="tmpdb_port" value="3306"/>
</php>
<testsuites>
<testsuite name="Doctrine DBAL Test Suite">
<directory>../Doctrine/Tests/DBAL</directory>
</testsuite>
</testsuites>
<filter>
<whitelist>
<directory suffix=".php">../../lib/Doctrine</directory>
</whitelist>
</filter>
<groups>
<exclude>
<group>performance</group>
<group>locking_functional</group>
</exclude>
</groups>
</phpunit>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment