Merge pull request #4310 from greg0ire/travis-to-gh

Migrate jobs away from Travis to Github Actions
doctrine · Oct 15, 2020 · 908cdc6 · 908cdc6
2 parents 0533e6f + 5bf8e74
commit 908cdc6
Show file tree

Hide file tree

Showing 23 changed files with 520 additions and 423 deletions.
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
diff --git a/.travis.yml b/.travis.yml
diff --git a/tests/travis/install-db2-ibm_db2.sh → ci/github/ext/install-ibm_db2.sh b/tests/travis/install-db2-ibm_db2.sh → ci/github/ext/install-ibm_db2.sh
@@ -5,8 +5,8 @@ set -ex
 echo "Installing extension"
 (
     # updating APT packages as per support recommendation
-    sudo apt -y -q update
-    sudo apt install ksh
+    sudo apt-get -y -q update
+    sudo apt-get install ksh php-pear
 
     cd /tmp
 
@@ -21,7 +21,6 @@ echo "Installing extension"
     cd ibm_db2-*
     phpize
     ./configure --with-IBM_DB2=/tmp/dsdriver
-    make -j `nproc`
-    make install
-    echo -e 'extension=ibm_db2.so\nibm_db2.instance_name=db2inst1' > ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/ibm_db2.ini
+    make -j "$(nproc)"
+    sudo make install
 )
diff --git a/tests/travis/ibm_db2.travis.xml → ci/github/phpunit/ibm_db2.xml b/tests/travis/ibm_db2.travis.xml → ci/github/phpunit/ibm_db2.xml
@@ -17,13 +17,13 @@
 
     <testsuites>
         <testsuite name="Doctrine DBAL Test Suite">
-            <directory>../Doctrine/Tests/DBAL</directory>
+            <directory>../../../tests</directory>
         </testsuite>
     </testsuites>
 
     <coverage>
         <include>
-            <directory suffix=".php">../../lib/Doctrine</directory>
+            <directory suffix=".php">../../../lib/Doctrine</directory>
         </include>
     </coverage>
 </phpunit>
diff --git a/tests/travis/mysqli-tls.docker.travis.xml → ci/github/phpunit/mysqli-tls.xml b/tests/travis/mysqli-tls.docker.travis.xml → ci/github/phpunit/mysqli-tls.xml
@@ -10,7 +10,7 @@
     <php>
         <var name="db_driver" value="mysqli"/>
         <var name="db_host" value="127.0.0.1"/>
-        <var name="db_port" value="33306"/>
+        <var name="db_port" value="3306"/>
         <var name="db_ssl_ca" value="ca.pem"/>
         <var name="db_ssl_cert" value="client-cert.pem"/>
         <var name="db_ssl_key" value="client-key.pem"/>
@@ -25,13 +25,13 @@
 
     <testsuites>
         <testsuite name="Doctrine DBAL Test Suite">
-            <directory>../Doctrine/Tests/DBAL</directory>
+            <directory>../../../tests</directory>
         </testsuite>
     </testsuites>
 
     <coverage>
         <include>
-            <directory suffix=".php">../../lib/Doctrine</directory>
+            <directory suffix=".php">../../../lib/Doctrine</directory>
         </include>
     </coverage>
 </phpunit>
diff --git a/tests/travis/mysqli.docker.travis.xml → ci/github/phpunit/mysqli.xml b/tests/travis/mysqli.docker.travis.xml → ci/github/phpunit/mysqli.xml
@@ -10,20 +10,20 @@
     <php>
         <var name="db_driver" value="mysqli"/>
         <var name="db_host" value="127.0.0.1" />
-        <var name="db_port" value="33306"/>
+        <var name="db_port" value="3306"/>
         <var name="db_user" value="root" />
         <var name="db_dbname" value="doctrine_tests" />
     </php>
 
     <testsuites>
         <testsuite name="Doctrine DBAL Test Suite">
-            <directory>../Doctrine/Tests/DBAL</directory>
+            <directory>../../../tests</directory>
         </testsuite>
     </testsuites>
 
     <coverage>
         <include>
-            <directory suffix=".php">../../lib/Doctrine</directory>
+            <directory suffix=".php">../../../lib/Doctrine</directory>
         </include>
     </coverage>
 </phpunit>
diff --git a/ci/github/phpunit.oci8.xml → ci/github/phpunit/oci8.xml b/ci/github/phpunit.oci8.xml → ci/github/phpunit/oci8.xml
@@ -24,13 +24,13 @@
 
     <testsuites>
         <testsuite name="Doctrine DBAL Test Suite">
-            <directory>../../tests</directory>
+            <directory>../../../tests</directory>
         </testsuite>
     </testsuites>
 
     <coverage>
         <include>
-            <directory suffix=".php">../../lib/Doctrine</directory>
+            <directory suffix=".php">../../../lib/Doctrine</directory>
         </include>
     </coverage>
 </phpunit>
diff --git a/tests/travis/mysql.docker.travis.xml → ci/github/phpunit/pdo_mysql.xml b/tests/travis/mysql.docker.travis.xml → ci/github/phpunit/pdo_mysql.xml
@@ -10,20 +10,20 @@
     <php>
         <var name="db_driver" value="pdo_mysql"/>
         <var name="db_host" value="127.0.0.1" />
-        <var name="db_port" value="33306"/>
+        <var name="db_port" value="3306"/>
         <var name="db_user" value="root" />
         <var name="db_dbname" value="doctrine_tests" />
     </php>
 
     <testsuites>
         <testsuite name="Doctrine DBAL Test Suite">
-            <directory>../Doctrine/Tests/DBAL</directory>
+            <directory>../../../tests</directory>
         </testsuite>
     </testsuites>
 
     <coverage>
         <include>
-            <directory suffix=".php">../../lib/Doctrine</directory>
+            <directory suffix=".php">../../../lib/Doctrine</directory>
         </include>
     </coverage>
 </phpunit>
diff --git a/ci/github/phpunit.pdo-oci.xml → ci/github/phpunit/pdo_oci.xml b/ci/github/phpunit.pdo-oci.xml → ci/github/phpunit/pdo_oci.xml
@@ -24,13 +24,13 @@
 
     <testsuites>
         <testsuite name="Doctrine DBAL Test Suite">
-            <directory>../../tests</directory>
+            <directory>../../../tests</directory>
         </testsuite>
     </testsuites>
 
     <coverage>
         <include>
-            <directory suffix=".php">../../lib/Doctrine</directory>
+            <directory suffix=".php">../../../lib/Doctrine</directory>
         </include>
     </coverage>
 </phpunit>
diff --git a/tests/travis/pgsql.travis.xml → ci/github/phpunit/pdo_pgsql.xml b/tests/travis/pgsql.travis.xml → ci/github/phpunit/pdo_pgsql.xml
@@ -11,18 +11,19 @@
         <var name="db_driver" value="pdo_pgsql"/>
         <var name="db_host" value="localhost" />
         <var name="db_user" value="postgres" />
+        <var name="db_password" value="postgres" />
         <var name="db_dbname" value="doctrine_tests" />
     </php>
 
     <testsuites>
         <testsuite name="Doctrine DBAL Test Suite">
-            <directory>../Doctrine/Tests/DBAL</directory>
+            <directory>../../../tests</directory>
         </testsuite>
     </testsuites>
 
     <coverage>
         <include>
-            <directory suffix=".php">../../lib/Doctrine</directory>
+            <directory suffix=".php">../../../lib/Doctrine</directory>
         </include>
     </coverage>
 </phpunit>
diff --git a/tests/travis/pdo_sqlsrv.travis.xml → ci/github/phpunit/pdo_sqlsrv.xml b/tests/travis/pdo_sqlsrv.travis.xml → ci/github/phpunit/pdo_sqlsrv.xml
@@ -17,13 +17,13 @@
 
     <testsuites>
         <testsuite name="Doctrine DBAL Test Suite">
-            <directory>../Doctrine/Tests/DBAL</directory>
+            <directory>../../../tests</directory>
         </testsuite>
     </testsuites>
 
     <coverage>
         <include>
-            <directory suffix=".php">../../lib/Doctrine</directory>
+            <directory suffix=".php">../../../lib/Doctrine</directory>
         </include>
     </coverage>
 </phpunit>
diff --git a/tests/travis/sqlite.travis.xml → ci/github/phpunit/sqlite.xml b/tests/travis/sqlite.travis.xml → ci/github/phpunit/sqlite.xml
@@ -9,13 +9,13 @@
 >
     <testsuites>
         <testsuite name="Doctrine DBAL Test Suite">
-            <directory>../Doctrine/Tests/DBAL</directory>
+            <directory>../../../tests</directory>
         </testsuite>
     </testsuites>
 
     <coverage>
         <include>
-            <directory suffix=".php">../../lib/Doctrine</directory>
+            <directory suffix=".php">../../../lib/Doctrine</directory>
         </include>
     </coverage>
 </phpunit>